Merge pull request #328 from SkyMarshal/master

Map update: Adds wardrobes for all jobs + copiers and filing cabinets.

code/game/asteroid/asteroid.dm

@@ -152,7 +152,7 @@ var/global/list/space_surprises = list(/obj/item/clothing/mask/facehugger,
 													/obj/item/weapon/rcd,
 													/obj/item/weapon/rcd_ammo,
 													/obj/item/weapon/spacecash,
-													/obj/item/weapon/cloaking_device,
+												//	/obj/item/weapon/cloaking_device,
 												//	/obj/item/weapon/gun/energy/teleport_gun,
 													/obj/item/weapon/rubber_chicken,
 													/obj/item/weapon/melee/energy/sword/pirate

code/game/machinery/doors/door.dm

@@ -298,15 +298,15 @@
 	var/Z = src:z
 	var/held = 1
 
-	if(src.holdopen)
-		while(held == 1 && holdopen) //If it is no longer hold open, it should close.
+	if(src.holdopen && !forcecrush)
+		while(held == 1 && holdopen && !forcecrush) //If it is no longer hold open, it should close.
 			sleep(held? 10:40)
 			held = 0
 			var/list/objects = locate(X,Y,Z)
 			for(var/obj/T in objects)
 				if(!istype(T,/obj/machinery/door) && !(istype(T,/obj/machinery) && T.anchored == 1)  && !istype(T,/obj/structure/cable) && !istype(T,/obj/structure/disposalpipe) && !(T.loc == get_turf(src)))
 					held = 1
-			for(var/mob/T in objects)
+			for(var/mob/living/T in objects) //Geez, ghosts were OP.
 				held = 1
 	animate("closing")
 	src.density = 1

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

@@ -190,6 +190,8 @@ CLIPBOARDS
 					src.overlays += "paper_stamped_denied"
 				if(/obj/item/weapon/stamp/clown)
 					src.overlays += "paper_stamped_clown"
+				if(/obj/item/weapon/stamp/centcom)
+					src.overlays += "paper_stamped_cent"
 				else
 					src.overlays += "paper_stamped"
 			if(!stamped)

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

@@ -557,6 +557,8 @@ CIRCULAR SAW
 			S.take_damage(15)
 
 		S.open = 0
+		if(S.display_name == "chest" && H:embryo_op_stage == 1.0)
+			H:embryo_op_stage = 0.0
 
 		H.updatehealth()
 		H.UpdateDamageIcon()
@@ -587,14 +589,14 @@ CIRCULAR SAW
 	if(user.zone_sel.selecting == "chest")
 		if(istype(M, /mob/living/carbon/human))
 			switch(M:embryo_op_stage)
-				if(0.0)
-					if(M != user)
-						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [M] is beginning to have \his torso cut open with [src] by [user].", 1)
-						M << "\red [user] begins to cut open your torso with [src]!"
-						user << "\red You cut [M]'s torso open with [src]!"
-						M:embryo_op_stage = 1.0
-						return
+//				if(0.0)
+//					if(M != user)
+//						for(var/mob/O in (viewers(M) - user - M))
+//							O.show_message("\red [M] is beginning to have \his torso cut open with [src] by [user].", 1)
+//						M << "\red [user] begins to cut open your torso with [src]!"
+//						user << "\red You cut [M]'s torso open with [src]!"
+//						M:embryo_op_stage = 1.0
+//						return
 				if(3.0)
 					if(M != user)
 						for(var/mob/O in (viewers(M) - user - M))
@@ -837,6 +839,8 @@ CIRCULAR SAW
 
 		S.open = 1
 		S.bleeding = 1
+		if(S.display_name == "chest")
+			H:embryo_op_stage = 1.0
 
 		H.updatehealth()
 		H.UpdateDamageIcon()

code/game/verbs/suicide.dm

@@ -11,7 +11,8 @@
 		src << "You can't commit suicide before the game starts!"
 		return
 
-	if (mind.special_role != "Syndicate")
+	var/list/allowed = list("Syndicate","traitor","Wizard","Head Revolutionary","Cultist","Changeling")
+	if (mind.special_role in allowed)
 		message_admins("[ckey] has tried to suicide, but they were not permitted due to not being antagonist as human.", 1)
 		src << "No.  Adminhelp if there is a legitimate reason."
 		return

code/modules/admin/verbs/adminhelp.dm

@@ -17,8 +17,12 @@
 			M << "\blue <b><font color=red>HELP: </font>[key_name(src, M)] (<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>) (<A HREF='?src=\ref[M.client.holder];adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?src=\ref[M.client.holder];secretsadmin=check_antagonist'>CA</A>):</b> [msg]"
 
 	usr << "Your message has been broadcast to administrators."
-	send2adminirc("#bs12admin","HELP: [src.key]: [msg]")
 	log_admin("HELP: [key_name(src)]: [msg]")
+
+	var/list/replacechars = list("'","\"",">","<","(",")")
+	for(var/rep in replacechars)
+		msg = dd_list2text((dd_text2list(msg, rep)))
+	send2adminirc("#bs12admin","HELP: [src.key]: [msg]")
 	if(tension_master)
 		tension_master.new_adminhelp()
 	return

code/modules/mob/living/carbon/human/examine.dm

@@ -168,10 +168,10 @@
 		if (!src.client)
 			usr << "\red [src.name] doesn't seem as though they want to talk."
 
-	for(var/name in organs)
-		var/datum/organ/external/temp = organs[name]
+	for(var/named in organs)
+		var/datum/organ/external/temp = organs[named]
 		if(temp.destroyed)
-			usr << "\red [name] is missing [t_his] [temp.display_name]."
+			usr << "\red [src.name] is missing [t_his] [temp.display_name]."
 		if(temp.wounds)
 			for(var/datum/organ/external/wound/w in temp.wounds)
 				var/size = w.wound_size
@@ -190,7 +190,7 @@
 					if(6)
 						sizetext = "massive wound"
 				if(w.bleeding)
-					usr << "\red [name] is bleeding from a [sizetext] on [t_his] [temp.display_name]."
+					usr << "\red [src.name] is bleeding from a [sizetext] on [t_his] [temp.display_name]."
 					continue
 
 	print_flavor_text()

code/modules/mob/living/say.dm

@@ -136,6 +136,10 @@
 	if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
 		message_mode = "whisper"
 
+	if(src.stunned > 0)
+		message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it
+
+
 	message = capitalize(message) //capitalize the first letter of what they actually say
 
 	// :downs:

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -152,7 +152,7 @@
 		src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
 		src.modules += new /obj/item/weapon/melee/baton(src)
 		src.modules += new /obj/item/weapon/gun/energy/taser/cyborg(src)
-		src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
+//		src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
 		return