Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

code/game/algorithm.dm

@@ -21,7 +21,6 @@ Starting up. [time2text(world.timeofday, "hh:mm.ss")]
 	LoadBans()
 	process_teleport_locs() //Sets up the wizard teleport locations
 	process_ghost_teleport_locs() //Sets up ghost teleport locations.
-	sleep_offline = 1
 
 	if (config.kick_inactive)
 		spawn(30)
@@ -195,4 +194,4 @@ proc/countJob(rank)
 				var/mob/M = T.host
 				if(M.client && M.machine == subject)
 					subject.attack_hand(M)
-*/
+*/

code/game/cellautomata.dm

@@ -106,8 +106,6 @@
 
 	..()
 
-	sleep(50)
-
 	plmaster = new /obj/effect/overlay(  )
 	plmaster.icon = 'tile_effects.dmi'
 	plmaster.icon_state = "plasma"
@@ -196,4 +194,4 @@
 /obj/effect/decal/point/point()
 	set src in oview()
 	set hidden = 1
-	return
+	return

code/game/gamemodes/game_mode.dm

@@ -47,7 +47,7 @@ Stealth and Camouflage Items;
 /obj/item/clothing/mask/gas/voice:4:Voice Changer;
 /obj/item/clothing/glasses/thermal:4:Thermal Imaging Glasses;
 /obj/item/device/chameleon:4:Chameleon-Projector;
-/obj/item/weapon/stamperaser:1:Stamp Remover;
+/obj/item/weapon/stamperaser:1:Stamp Remover and Forger;
 Whitespace:Seperator;
 Devices and Tools;
 /obj/item/weapon/card/emag:4:Cryptographic Sequencer (Limited uses, almost full access);

code/game/machinery/alarm.dm

@@ -1191,8 +1191,17 @@ table tr:first-child th:first-child { border: none;}
 	A = A.loc
 	if (!( istype(A, /area) ))
 		return
-	for(var/area/RA in A.related)
-		RA.firereset()
+	if(network)
+		for(var/obj/machinery/door/firedoor/D in world)
+			if(!D.blocked && D.net_id == src.network)
+				if(D.operating)
+					D.nextstate = CLOSED
+				else if(!D.density)
+					spawn(0)
+						D.close()
+	else
+		for(var/area/RA in A.related)
+			RA.firereset()
 	return
 
 /obj/machinery/firealarm/proc/alarm()
@@ -1202,8 +1211,17 @@ table tr:first-child th:first-child { border: none;}
 	A = A.loc
 	if (!( istype(A, /area) ))
 		return
-	for(var/area/RA in A.related)
-		RA.firealert()
+	if(network)
+		for(var/obj/machinery/door/firedoor/D in world)
+			if(!D.blocked && D.net_id == src.network)
+				if(D.operating)
+					D.nextstate = OPEN
+				else if(!D.density)
+					spawn(0)
+						D.open()
+	else
+		for(var/area/RA in A.related)
+			RA.firealert()
 	//playsound(src.loc, 'signal.ogg', 75, 0)
 	return
 

code/game/machinery/computer/card.dm

@@ -187,7 +187,10 @@
 		if ("modify")
 			if (modify)
 				data_core.manifest_modify(modify.registered_name, modify.assignment)
-				modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
+				if(istype(modify,/obj/item/weapon/card/id/fluff/lifetime))
+					modify.name = text("[modify.registered_name]'s Lifetime ID Card ([modify.assignment])")
+				else
+					modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
 				if(ishuman(usr))
 					modify.loc = usr.loc
 					if(!usr.get_active_hand())

code/game/machinery/doors/firedoor.dm

@@ -11,7 +11,7 @@
 	opacity = 0
 	density = 0
 	var/nextstate = null
-
+	var/net_id
 
 	Bumped(atom/AM)
 		if(p_open || operating)	return

code/game/master_controller.dm

@@ -47,6 +47,12 @@ datum/controller/game_controller
 
 		world.tick_lag = config.Ticklag
 
+		//	Sleep for about 5 seconds to allow background initialization procs to finish
+		sleep(50)
+
+		//	Now that the game is world is fully initialized, pause server until a user connects.
+		world.sleep_offline = 1
+
 		setup_objects()
 
 		setupgenetics()
@@ -235,4 +241,4 @@ datum/controller/game_controller
 				else
 					for (var/mob/M in world)
 						if (M.client && M.client.holder)
-							M << "<font color='red' size='2'><b> The Master Controller has fired.  Automatic restart aborted.</b></font>"
+							M << "<font color='red' size='2'><b> The Master Controller has fired.  Automatic restart aborted.</b></font>"

code/game/objects/items/weapons/papers_bins.dm

@@ -202,32 +202,69 @@ NOTEBOOK
 			user << "\blue You stamp the paper with your rubber stamp."
 
 		if(istype(P, /obj/item/weapon/stamperaser))
-			if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
-				return
-			src.info = src.infoold
-			src.infoold = null
-			for(var/i, i <= stamped.len, i++)
-				switch(stamped[i])
-					if(/obj/item/weapon/stamp/captain)
-						src.overlays -= "paper_stamped_cap"
-					if(/obj/item/weapon/stamp/hop)
-						src.overlays -= "paper_stamped_hop"
-					if(/obj/item/weapon/stamp/hos)
-						src.overlays -= "paper_stamped_hos"
-					if(/obj/item/weapon/stamp/ce)
-						src.overlays -= "paper_stamped_ce"
-					if(/obj/item/weapon/stamp/rd)
-						src.overlays -= "paper_stamped_rd"
-					if(/obj/item/weapon/stamp/cmo)
-						src.overlays -= "paper_stamped_cmo"
-					if(/obj/item/weapon/stamp/denied)
-						src.overlays -= "paper_stamped_denied"
-					if(/obj/item/weapon/stamp/clown)
-						src.overlays -= "paper_stamped_clown"
-					else
-						src.overlays -= "paper_stamped"
-			stamped = list()
-			user << "\blue You sucessfully remove those pesky stamps."
+			switch(alert("Would you like to erase all stamps, or forge one?","Choose.","Erase","Forge"))
+				if("Erase")
+					if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
+						return
+					src.info = src.infoold
+					src.infoold = null
+					src.overlays -= "paper_stamped_cap"
+					src.overlays -= "paper_stamped_hop"
+					src.overlays -= "paper_stamped_hos"
+					src.overlays -= "paper_stamped_ce"
+					src.overlays -= "paper_stamped_rd"
+					src.overlays -= "paper_stamped_cmo"
+					src.overlays -= "paper_stamped_denied"
+					src.overlays -= "paper_stamped_clown"
+					src.overlays -= "paper_stamped"
+					stamped = list()
+					user << "\blue You sucessfully remove those pesky stamps."
+					return
+				if("Forge")
+					if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
+						return
+					if(!src.infoold)
+						src.infoold = src.info
+					var/forgename = ""
+					var/stamptype = ""
+					var/pathtype = ""
+					var/list/stamps = list("Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "DENIED")
+					stamptype = input("Select a stamp type.", null) in stamps
+					if(stamptype == "Captain")
+						src.overlays += "paper_stamped_cap"
+						forgename = "captain's rubber stamp"
+						pathtype = "/obj/item/weapon/stamp/captain"
+					else if(stamptype == "Head of Personnel")
+						src.overlays += "paper_stamped_hop"
+						forgename = "head of personnel's rubber stamp"
+						pathtype = "/obj/item/weapon/stamp/hop"
+					else if(stamptype == "Head of Security")
+						src.overlays += "paper_stamped_hos"
+						forgename = "head of security's rubber stamp"
+						pathtype = "/obj/item/weapon/stamp/hos"
+					else if(stamptype == "Chief Engineer")
+						src.overlays += "paper_stamped_ce"
+						forgename = "chief engineers's rubber stamp"
+						pathtype = "/obj/item/weapon/stamp/ce"
+					else if(stamptype == "Research Director")
+						src.overlays += "paper_stamped_rd"
+						forgename = "research director's rubber stamp"
+						pathtype = "/obj/item/weapon/stamp/rd"
+					else if(stamptype == "Chief Medical Officer")
+						src.overlays += "paper_stamped_cmo"
+						forgename = "chief medical officer's rubber stamp"
+						pathtype = "/obj/item/weapon/stamp/cmo"
+					else if(stamptype == "DENIED")
+						src.overlays += "paper_stamped_denied"
+						forgename = "\improper DENIED rubber stamp"
+						pathtype = "/obj/item/weapon/stamp/denied"
+					src.info += text("<BR><i>This paper has been stamped with the [].</i><BR>", forgename)
+					if(!stamped)
+						stamped = new
+					stamped += pathtype
+
+					user << "\blue You forge a stamp on the paper."
+					return
 
 	/*
 	else

code/game/verbs/ooc.dm

@@ -41,6 +41,8 @@
 			if (src.client.holder.rank == "Admin Observer")
 				C << "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>"
 			else if (src.client.holder.rank == "Retired Admin")
+				C << "<span class='ooc'><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>"
+			else if (src.client.holder.level >= 5)
 				C << "<font color=[src.client.ooccolor]><b><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></b></font>"
 			else
 				C << "<span class='adminooc'><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>"