Updating branch

baystation12.int

@@ -1,6 +1,11 @@
 // BEGIN_INTERNALS
 /*
 MAP_ICON_TYPE: 0
+WINDOW: code\stylesheet.dm
+LAST_COMPILE_VERSION: 506.1247
+DIR: code code\game\machinery code\game\verbs code\modules code\modules\admin code\modules\admin\verbs code\modules\clothing code\modules\clothing\spacesuits code\modules\economy code\modules\events code\modules\mob code\modules\mob\living 
+FILE: code\stylesheet.dm
+LAST_COMPILE_TIME: 1439679616
 AUTO_FILE_DIR: OFF
 */
 // END_INTERNALS

code/ATMOSPHERICS/components/valve.dm

@@ -17,6 +17,7 @@
 
 	var/datum/pipe_network/network_node1
 	var/datum/pipe_network/network_node2
+	var/badpipe = 0
 
 /obj/machinery/atmospherics/valve/open
 	open = 1
@@ -94,6 +95,9 @@
 	open = 1
 	update_icon()
 
+	if(badpipe == 1)
+		message_admins("[usr] ([usr.ckey]) is opening a potential bad valve that could ruin the stations atmos! Either Co2, Phoron, or N2O! (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[usr.x];Y=[usr.y];Z=[usr.z]'>JMP</a>)")
+
 	if(network_node1&&network_node2)
 		network_node1.merge(network_node2)
 		network_node2 = network_node1

code/_onclick/ai.dm

@@ -156,12 +156,13 @@
 	return
 
 /obj/machinery/door/airlock/AIMiddleClick() // Toggles door bolt lights.
-	if(!src.lights)
-		Topic(src, list("src"= "\ref[src]", "command"="lights", "activate" = "1"), 1) // 1 meaning no window (consistency!)
+	if(!src.emergency)
+		Topic(src, list("src"= "\ref[src]", "command"="emergency", "activate" = "1"), 1) // 1 meaning no window (consistency!)
 	else
-		Topic(src, list("src"= "\ref[src]", "command"="lights", "activate" = "0"), 1)
+		Topic(src, list("src"= "\ref[src]", "command"="emergency", "activate" = "0"), 1)
 	return
 
+
 //
 // Override AdjacentQuick for AltClicking
 //

code/controllers/configuration.dm

@@ -63,8 +63,8 @@ var/list/gamemode_cache = list()
 	var/guest_jobban = 1
 	var/usewhitelist = 0
 	var/kick_inactive = 0				//force disconnect for inactive players after this many minutes, if non-0
-	var/show_mods = 0
-	var/show_mentors = 0
+	var/show_mods = 1
+	var/show_mentors = 1
 	var/mods_can_tempban = 0
 	var/mods_can_job_tempban = 0
 	var/mod_tempban_max = 1440
@@ -138,7 +138,7 @@ var/list/gamemode_cache = list()
 	var/use_loyalty_implants = 0
 
 	var/welder_vision = 1
-	var/generate_asteroid = 0
+	var/generate_asteroid = 1
 
 	//Used for modifying movement speed for mobs.
 	//Unversal modifiers

code/datums/supplypacks.dm

@@ -813,8 +813,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	name = "Energy marksman crate"
 	contains = list(/obj/item/clothing/suit/armor/laserproof,
 					/obj/item/clothing/suit/armor/laserproof,
-					/obj/item/weapon/gun/energy/sniperrifle,
-					/obj/item/weapon/gun/energy/sniperrifle)
+					/obj/item/weapon/gun/energy/xray,
+					/obj/item/weapon/gun/energy/xray)
 	cost = 90
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Energy marksman crate"

code/game/area/Space Station 13 areas.dm

@@ -130,7 +130,7 @@ area/space/atmosalert()
 /area/admin
 	name = "\improper Admin room"
 	icon_state = "start"
-
+	requires_power = 0
 
 
 ////////////

code/game/machinery/cryopod.dm

@@ -180,7 +180,7 @@
 
 	var/mob/occupant = null       // Person waiting to be despawned.
 	var/orient_right = null       // Flips the sprite.
-	var/time_till_despawn = 18000 // 30 minutes-ish safe period before being despawned.
+	var/time_till_despawn = 6000 // 10 minutes-ish safe period before being despawned.
 	var/time_entered = 0          // Used to keep track of the safe period.
 	var/obj/item/device/radio/intercom/announce //
 

code/game/machinery/doors/airlock.dm

@@ -489,7 +489,7 @@ About the new airlock wires panel:
 			icon_state = "door_locked"
 		else
 			icon_state = "door_closed"
-		if(p_open || welded)
+		if(p_open || welded || emergency)
 			overlays = list()
 			if(p_open)
 				overlays += image(icon, "panel_open")
@@ -500,6 +500,8 @@ About the new airlock wires panel:
 					overlays += image(icon, "sparks_damaged")
 			if(welded)
 				overlays += image(icon, "welded")
+			if(emergency && !locked)
+				overlays += image(icon, "elights")
 		else if (health < maxhealth * 3/4 && !(stat & NOPOWER))
 			overlays += image(icon, "sparks_damaged")
 	else
@@ -556,6 +558,7 @@ About the new airlock wires panel:
 	commands[++commands.len] = list("name" = "Safeties",				"command"= "safeties",				"active" = safe,					"enabled" = "Nominal",	"disabled" = "Overridden",	"danger" = 1, "act" = 0)
 	commands[++commands.len] = list("name" = "Timing",					"command"= "timing",				"active" = normalspeed,				"enabled" = "Nominal",	"disabled" = "Overridden",	"danger" = 1, "act" = 0)
 	commands[++commands.len] = list("name" = "Door State",				"command"= "open",					"active" = density,					"enabled" = "Closed",	"disabled" = "Opened", 		"danger" = 0, "act" = 0)
+	commands[++commands.len] = list("name" = "Emergency",				"command"= "emergency",					"active" = !emergency,					"enabled" = "Disabled",	"disabled" = "Enabled", 		"danger" = 0, "act" = 0)
 
 	data["commands"] = commands
 
@@ -728,6 +731,13 @@ About the new airlock wires panel:
 			else if (activate && !src.lights)
 				lights = 1
 				usr << "The door bolt lights have been enabled."
+		if("emergency")
+			// Emergency access
+			if (src.emergency)
+				emergency = 0
+			else
+				emergency = 1
+
 
 	update_icon()
 	return 1

code/game/machinery/doors/door.dm

@@ -18,6 +18,7 @@
 	var/operating = 0
 	var/autoclose = 0
 	var/glass = 0
+	var/emergency = 0 // Emergency access override
 	var/normalspeed = 1
 	var/heat_proof = 0 // For glass airlocks/opacity firedoors
 	var/air_properties_vary_with_direction = 0
@@ -105,7 +106,7 @@
 
 	if(istype(AM, /obj/machinery/bot))
 		var/obj/machinery/bot/bot = AM
-		if(src.check_access(bot.botcard))
+		if(src.check_access(bot.botcard) || emergency == 1)
 			if(density)
 				open()
 		return
@@ -120,7 +121,7 @@
 	if(istype(AM, /obj/mecha))
 		var/obj/mecha/mecha = AM
 		if(density)
-			if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access)))
+			if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access) || emergency == 1))
 				open()
 			else
 				do_animate("deny")
@@ -149,8 +150,10 @@
 		return
 	src.add_fingerprint(user)
 	if(density)
-		if(allowed(user))	open()
-		else				do_animate("deny")
+		if(allowed(user) || src.emergency == 1)
+			open()
+		else
+			do_animate("deny")
 	return
 
 /obj/machinery/door/meteorhit(obj/M as obj)
@@ -291,7 +294,7 @@
 		operating = -1
 		return 1
 
-	if(src.allowed(user) && operable())
+	if(src.allowed(user) && operable() || src.emergency == 1)
 		if(src.density)
 			open()
 		else

code/game/objects/items/weapons/storage/backpack.dm

@@ -76,7 +76,7 @@
 			return
 			*/
 		..()
-	
+
 	//Please don't clutter the parent storage item with stupid hacks.
 	can_be_inserted(obj/item/W as obj, stop_messages = 0)
 		if(istype(W, /obj/item/weapon/storage/backpack/holding))
@@ -121,23 +121,31 @@
 	name = "medical backpack"
 	desc = "It's a backpack especially designed for use in a sterile environment."
 	icon_state = "medicalpack"
+	storage_slots = 10
+	max_storage_space = 36
 	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/security
 	name = "security backpack"
 	desc = "It's a very robust backpack."
 	icon_state = "securitypack"
+	storage_slots = 10
+	max_storage_space = 36
 	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/captain
 	name = "captain's backpack"
 	desc = "It's a special backpack made exclusively for Nanotrasen officers."
 	icon_state = "captainpack"
+	storage_slots = 14
+	max_storage_space = 46
 	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/industrial
 	name = "industrial backpack"
 	desc = "It's a tough backpack for the daily grind of station life."
+	storage_slots = 14
+	max_storage_space = 46
 	icon_state = "engiepack"
 	item_state_slots = null
 
@@ -155,16 +163,22 @@
 	name = "geneticist backpack"
 	desc = "It's a backpack fitted with slots for diskettes and other workplace tools."
 	icon_state = "genpack"
+	storage_slots = 10
+	max_storage_space = 36
 
 /obj/item/weapon/storage/backpack/virology
 	name = "sterile backpack"
 	desc = "It's a sterile backpack able to withstand different pathogens from entering its fabric."
 	icon_state = "viropack"
+	storage_slots = 10
+	max_storage_space = 36
 
 /obj/item/weapon/storage/backpack/chemistry
 	name = "chemistry backpack"
 	desc = "It's an orange backpack which was designed to hold beakers, pill bottles and bottles."
 	icon_state = "chempack"
+	storage_slots = 10
+	max_storage_space = 36
 
 /*
  * Satchel Types
@@ -189,6 +203,8 @@
 	name = "industrial satchel"
 	desc = "A tough satchel with extra pockets."
 	icon_state = "satchel-eng"
+	storage_slots = 14
+	max_storage_space = 46
 	item_state_slots = list(
 		slot_l_hand_str = "engiepack",
 		slot_r_hand_str = "engiepack",
@@ -198,6 +214,8 @@
 	name = "medical satchel"
 	desc = "A sterile satchel used in medical departments."
 	icon_state = "satchel-med"
+	storage_slots = 10
+	max_storage_space = 36
 	item_state_slots = list(
 		slot_l_hand_str = "medicalpack",
 		slot_r_hand_str = "medicalpack",
@@ -207,16 +225,22 @@
 	name = "virologist satchel"
 	desc = "A sterile satchel with virologist colours."
 	icon_state = "satchel-vir"
+	storage_slots = 10
+	max_storage_space = 36
 
 /obj/item/weapon/storage/backpack/satchel_chem
 	name = "chemist satchel"
 	desc = "A sterile satchel with chemist colours."
 	icon_state = "satchel-chem"
+	storage_slots = 10
+	max_storage_space = 36
 
 /obj/item/weapon/storage/backpack/satchel_gen
 	name = "geneticist satchel"
 	desc = "A sterile satchel with geneticist colours."
 	icon_state = "satchel-gen"
+	storage_slots = 10
+	max_storage_space = 36
 
 /obj/item/weapon/storage/backpack/satchel_tox
 	name = "scientist satchel"
@@ -227,6 +251,8 @@
 	name = "security satchel"
 	desc = "A robust satchel for security related needs."
 	icon_state = "satchel-sec"
+	storage_slots = 10
+	max_storage_space = 36
 	item_state_slots = list(
 		slot_l_hand_str = "securitypack",
 		slot_r_hand_str = "securitypack",
@@ -241,6 +267,8 @@
 	name = "captain's satchel"
 	desc = "An exclusive satchel for Nanotrasen officers."
 	icon_state = "satchel-cap"
+	storage_slots = 14
+	max_storage_space = 46
 	item_state_slots = list(
 		slot_l_hand_str = "satchel-cap",
 		slot_r_hand_str = "satchel-cap",
@@ -260,21 +288,29 @@
 /obj/item/weapon/storage/backpack/ert/commander
 	name = "emergency response team commander backpack"
 	desc = "A spacious backpack with lots of pockets, worn by the commander of a Nanotrasen Emergency Response Team."
+	storage_slots = 14
+	max_storage_space = 46
 
 //Security
 /obj/item/weapon/storage/backpack/ert/security
 	name = "emergency response team security backpack"
 	desc = "A spacious backpack with lots of pockets, worn by security members of a Nanotrasen Emergency Response Team."
 	icon_state = "ert_security"
+	storage_slots = 10
+	max_storage_space = 36
 
 //Engineering
 /obj/item/weapon/storage/backpack/ert/engineer
 	name = "emergency response team engineer backpack"
 	desc = "A spacious backpack with lots of pockets, worn by engineering members of a Nanotrasen Emergency Response Team."
 	icon_state = "ert_engineering"
+	storage_slots = 14
+	max_storage_space = 46
 
 //Medical
 /obj/item/weapon/storage/backpack/ert/medical
 	name = "emergency response team medical backpack"
 	desc = "A spacious backpack with lots of pockets, worn by medical members of a Nanotrasen Emergency Response Team."
 	icon_state = "ert_medical"
+	storage_slots = 10
+	max_storage_space = 36

code/global.dm

@@ -85,14 +85,14 @@ var/SMALLSIZEBLOCK     = 0
 
 var/skipupdate = 0
 
-var/eventchance = 10 // Percent chance per 5 minutes.
+var/eventchance = 20 // Percent chance per 5 minutes.
 var/event       = 0
 var/hadevent    = 0
 var/blobevent   = 0
 
 var/diary          = null
 var/href_logfile   = null
-var/station_name   = "NSS Exodus"
+var/station_name   = "NSS Aphelion"
 var/game_version   = "Baystation12"
 var/changelog_hash = ""
 var/game_year      = (text2num(time2text(world.realtime, "YYYY")) + 544)

code/hub.dm

@@ -1,7 +1,7 @@
 /world
 
 	hub = "Exadv1.spacestation13"
-	hub_password = "SORRYNOPASSWORD"
+	hub_password = "kMZy3U5jJHSiBQjr"
 	name = "Space Station 13"
 /* This is for any host that would like their server to appear on the main SS13 hub.
 To use it, simply replace the password above, with the password found below, and it should work.

code/modules/admin/admin.dm

@@ -15,7 +15,7 @@ var/global/floorIsLava = 0
 	log_attack(text)
 	var/rendered = "<span class=\"log_message\"><span class=\"prefix\">ATTACK:</span> <span class=\"message\">[text]</span></span>"
 	for(var/client/C in admins)
-		if(R_ADMIN & C.holder.rights)
+		if(R_MOD & C.holder.rights)
 			if(C.prefs.toggles & CHAT_ATTACKLOGS)
 				var/msg = rendered
 				C << msg