Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/rifle

code/__DEFINES/layers.dm

@@ -83,10 +83,15 @@
 
 #define ABOVE_SPECIAL_RESIN_STRUCTURE_LAYER 3.01
 
+/// A layer above objects (like structures) but below items
+#define BETWEEN_OBJECT_ITEM_LAYER 3.01
+
+/// The layer on which items lay
+#define ITEM_LAYER 3.02
 /// for items that should be at the top of the pile of items
-#define UPPER_ITEM_LAYER 3.01
+#define UPPER_ITEM_LAYER 3.03
 /// just above all items
-#define ABOVE_OBJ_LAYER 3.02
+#define ABOVE_OBJ_LAYER 3.04
 
 #define BUSH_LAYER 3.05
 

code/game/machinery/fax_machine.dm

@@ -396,15 +396,15 @@ var/list/alldepartments = list()
 							P.stamps += "<HR><i>This paper has been stamped by the USCM High Command Quantum Relay.</i>"
 						if("NC4 UA Federal Secure Network - CMB Relay")
 							var/image/stampoverlay = image('icons/obj/items/paper.dmi')
-							stampoverlay.icon_state = "paper_stamp-uscm" // placeholder icon
+							stampoverlay.icon_state = "paper_stamp-cmb"
 							if(!P.stamped)
 								P.stamped = new
 							P.stamped += /obj/item/tool/stamp
 							P.overlays += stampoverlay
 							P.stamps += "<HR><i>This paper has been stamped by The Office of Colonial Marshals.</i>"
 						if("Weyland-Yutani Quantum Relay")
 							var/image/stampoverlay = image('icons/obj/items/paper.dmi')
-							stampoverlay.icon_state = "paper_stamp-cent"
+							stampoverlay.icon_state = "paper_stamp-weyyu"
 							if(!P.stamped)
 								P.stamped = new
 							P.stamped += /obj/item/tool/stamp

code/game/objects/effects/landmarks/corpsespawner.dm

@@ -48,10 +48,6 @@
 	name = "Engineer"
 	equip_path = /datum/equipment_preset/corpse/engineer
 
-/obj/effect/landmark/corpsespawner/clown
-	name = "Clown"
-	equip_path = /datum/equipment_preset/corpse/clown
-
 /obj/effect/landmark/corpsespawner/scientist
 	name = "Scientist"
 	equip_path = /datum/equipment_preset/corpse/scientist

code/game/objects/items.dm

@@ -2,8 +2,8 @@
 	name = "item"
 	icon = 'icons/obj/items/items.dmi'
 	mouse_drag_pointer = MOUSE_ACTIVE_POINTER
+	layer = ITEM_LAYER
 	light_system = MOVABLE_LIGHT
-
 	/// this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
 	var/image/blood_overlay = null
 	var/randpixel = 6

code/game/objects/items/tools/misc_tools.dm

@@ -420,12 +420,20 @@
 	name = "internal affairs rubber stamp"
 	icon_state = "stamp-intaff"
 
-/obj/item/tool/stamp/centcomm
-	name = "centcomm rubber stamp"
-	icon_state = "stamp-cent"
+/obj/item/tool/stamp/weyyu
+	name = "WY rubber stamp"
+	icon_state = "stamp-weyyu"
+
+/obj/item/tool/stamp/uscm
+	name = "USCM rubber stamp"
+	icon_state = "stamp-uscm"
+
+/obj/item/tool/stamp/cmb
+	name = "CMB rubber stamp"
+	icon_state = "stamp-cmb"
 
 /obj/item/tool/stamp/ro
-	name = "requisitions officer's rubber stamp"
+	name = "quartermaster's rubber stamp"
 	icon_state = "stamp-ro"
 
 /obj/item/tool/carpenters_hammer //doesn't do anything, yet

code/game/objects/structures/crates_lockers/closets/coffin.dm

@@ -6,6 +6,7 @@
 	icon_opened = "coffin_open"
 	material = MATERIAL_WOOD
 	anchored = FALSE
+	layer = BETWEEN_OBJECT_ITEM_LAYER
 
 /obj/structure/closet/coffin/update_icon()
 	if(!opened)

code/modules/admin/topic/topic.dm

@@ -1502,7 +1502,7 @@
 
 						// Stamps
 						var/image/stampoverlay = image('icons/obj/items/paper.dmi')
-						stampoverlay.icon_state = "paper_stamp-cent"
+						stampoverlay.icon_state = "paper_stamp-weyyu"
 						if(!P.stamped)
 							P.stamped = new
 						P.stamped += /obj/item/tool/stamp
@@ -1584,7 +1584,7 @@
 
 						// Stamps
 						var/image/stampoverlay = image('icons/obj/items/paper.dmi')
-						stampoverlay.icon_state = "paper_stamp-cent"
+						stampoverlay.icon_state = "paper_stamp-cmb"
 						if(!P.stamped)
 							P.stamped = new
 						P.stamped += /obj/item/tool/stamp

code/modules/cm_aliens/weeds.dm

@@ -193,13 +193,16 @@
 // If you're still confused, scroll aaaall the way down to the bottom of the file.
 // that's /obj/effect/alien/weeds/node/Destroy().
 /obj/effect/alien/weeds/proc/avoid_orphanage()
-	for(var/obj/effect/alien/weeds/node/N in orange(node_range, get_turf(src)))
-		// WE FOUND A NEW MOMMY
-		N.add_child(src)
-		break
+	var/parent_type = /obj/effect/alien/weeds/node
+	if(weed_strength >= WEED_LEVEL_HIVE)
+		parent_type = /obj/effect/alien/weeds/node/pylon
+
+	var/obj/effect/alien/weeds/node/found = locate(parent_type) in orange(node_range, get_turf(src))
+	if(found)
+		found.add_child(src)
 
 	// NO MORE FOOD ON THE TABLE. WE DIE
-	if(!parent || weed_strength > WEED_LEVEL_STANDARD)
+	if(!parent)
 		qdel(src)
 
 /obj/effect/alien/weeds/proc/weed_expand()

code/modules/cm_marines/codebook.dm

@@ -1,24 +1,56 @@
+GLOBAL_LIST_EMPTY(codebook_data)
 
-/obj/item/book/codebook
-	name = "Almayer Code Book"
-	unique = 1
-	dat = ""
+/obj/item/book/codebook/proc/create_codebook(faction = FACTION_MARINE)
+	if(!GLOB.codebook_data[faction])
+		GLOB.codebook_data[faction] = generate_code()
 
-/obj/item/book/codebook/Initialize()
-	. = ..()
+	dat = GLOB.codebook_data[faction]
+
+/obj/item/book/codebook/proc/generate_code()
 	var/number
 	var/letter
-	dat = "<table><tr><th>Call</th><th>Response<th></tr>"
+	var/code_data = "<table><tr><th>Call</th><th>Response<th></tr>"
 	for(var/i in 1 to 10)
 		letter = pick(greek_letters)
 		number = rand(100,999)
-		dat += "<tr><td>[letter]-[number]</td>"
+		code_data += "<tr><td>[letter]-[number]</td>"
 		letter = pick(greek_letters)
 		number = rand(100,999)
-		dat += "<td>[letter]-[number]</td></tr>"
+		code_data += "<td>[letter]-[number]</td></tr>"
+	code_data += "</table>"
+	return code_data
+
+/obj/item/book/codebook
+	name = "USS Almayer Code Book"
+	author = "United States Colonial Marines"
+	unique = 1
+	dat = ""
+	var/faction = FACTION_MARINE
+
+/obj/item/book/codebook/Initialize()
+	. = ..()
+	title = name
+	create_codebook(faction)
+
+/obj/item/book/codebook/clf
+	name = "Liberation Front Authenticators"
+	faction = FACTION_CLF
+	author = "\[Obscured Ink\]"
+
+/obj/item/book/codebook/twe
+	name = "Imperial Authentication Codes"
+	faction = FACTION_TWE
+	author = "Royal Marines"
 
-	dat += "</table>"
+/obj/item/book/codebook/upp
+	name = "Union Authentication Codes"
+	faction = FACTION_UPP
+	author = "People's Army"
 
+/obj/item/book/codebook/wey_yu
+	name = "Corporate Authentication Codes"
+	faction = FACTION_WY
+	author = "Weyland-Yutani Communications Division"
 
 /obj/item/book/codebook/attackby(obj/item/W, mob/living/user)
 	if(istype(W, /obj/item/tool/kitchen/knife) || HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS))