MultiZ Layenia Base

code/game/objects/effects/contraband.dm

@@ -408,6 +408,21 @@
 	desc = "A poster advertising a movie about some masked men."
 	icon_state = "poster44"
 
+/obj/structure/sign/poster/contraband/moffuchis_pizza
+	name = "Moffy's Pizzeria"
+	desc = "Moffy's Pizzeria™: family style pizza for 2 centuries."
+	icon_state = "poster45"
+
+/obj/structure/sign/poster/contraband/donk_co
+	name = "DONK CO. BRAND MICROWAVEABLE FOOD"
+	desc = "DONK CO. BRAND MICROWAVABLE FOOD: MADE BY STARVING COLLEGE STUDENTS, FOR STARVING COLLEGE STUDENTS."
+	icon_state = "poster46"
+
+/obj/structure/sign/poster/contraband/cybersun_six_hundred
+	name = "Saibāsan: 600 Years Commemorative Poster"
+	desc = "An artistic poster commemorating 600 years of continual business for Cybersun Industries."
+	icon_state = "poster47"
+
 /obj/structure/sign/poster/official
 	poster_item_name = "motivational poster"
 	poster_item_desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface."
@@ -594,4 +609,29 @@
 	desc = "This informational poster teaches the viewer what carbon dioxide is."
 	icon_state = "poster35_legit"
 
+/obj/structure/sign/poster/official/moth_hardhat
+	name = "Safety Moth - Hardhats"
+	desc = "This informational poster uses Safety Moth™ to tell the viewer to wear hardhats in cautious areas. \"It's like a lamp for your head!\""
+	icon_state = "poster36_legit"
+
+/obj/structure/sign/poster/official/moth_piping
+	name = "Safety Moth - Piping"
+	desc = "This informational poster uses Safety Moth™ to tell atmospheric technicians correct types of piping to be used. \"Pipes, not Pumps! Proper pipe placement prevents poor performance!\""
+	icon_state = "poster37_legit"
+
+/obj/structure/sign/poster/official/moth_meth
+	name = "Safety Moth - Methamphetamine"
+	desc = "This informational poster uses Safety Moth™ to tell the viewer to seek CMO approval before cooking methamphetamine. \"Stay close to the target temperature, and never go over!\" ...You shouldn't ever be making this."
+	icon_state = "poster38_legit"
+
+/obj/structure/sign/poster/official/moth_epi
+	name = "Safety Moth - Epinephrine"
+	desc = "This informational poster uses Safety Moth™ to inform the viewer to help injured/deceased crewmen with their epinephrine injectors. \"Prevent organ rot with this one simple trick!\""
+	icon_state = "poster39_legit"
+
+/obj/structure/sign/poster/official/corporate_perks_vacation
+	name = "Nanotrasen Corporate Perks: Vacation"
+	desc = "You wish you were here? You can be, Plan today and get 10% off your next vacation on us."
+	icon_state = "poster40_legit"
+
 #undef PLACE_SPEED

code/game/objects/effects/decals/turfdecal/weather.dm

@@ -9,4 +9,24 @@
 /obj/effect/turf_decal/weather/snow/corner
 	name = "snow corner piece"
 	icon = 'icons/turf/snow.dmi'
-	icon_state = "snow_corner"
+	icon_state = "snow_corner"
+
+/obj/effect/turf_decal/weather/grass
+	name = "grass box piece"
+	icon = 'icons/turf/grass.dmi'
+	icon_state = "grass_box"
+
+/obj/effect/turf_decal/weather/grass/line
+	name = "grass line piece"
+	icon = 'icons/turf/grass.dmi'
+	icon_state = "grass_line"
+
+/obj/effect/turf_decal/weather/grass/corner
+	name = "grass corner piece"
+	icon = 'icons/turf/grass.dmi'
+	icon_state = "grass_corner"
+
+/obj/effect/turf_decal/weather/grass/surround
+	name = "grass surround piece"
+	icon = 'icons/turf/grass.dmi'
+	icon_state = "grass_surround"

code/game/objects/items/cosmetics.dm

@@ -126,7 +126,7 @@
 					H.update_body()
 	else
 		..()
-
+/* SKYRAT EDIT REMOVAL
 /obj/item/razor
 	name = "electric razor"
 	desc = "The latest and greatest power razor born from the science of shaving."
@@ -216,4 +216,5 @@
 		else
 			..()
 	else
-		..()
+		..()
+*/

code/game/objects/items/dyekit.dm

@@ -4,6 +4,8 @@
 	icon = 'icons/obj/dyespray.dmi'
 	icon_state = "dyespray"
 
+	var/uses = 10 //SKYRAT EDIT ADDITION
+
 /obj/item/dyespray/attack_self(mob/user)
 	dye(user)
 
@@ -21,6 +23,10 @@
 /obj/item/dyespray/proc/dye(mob/target)
 	if(!ishuman(target))
 		return
+
+	if(!uses) //SKYRAT EDIT ADDITION
+		return //SKYRAT EDIT ADDITION
+	
 	var/mob/living/carbon/human/human_target = target
 
 	var/new_hair_color = input(usr, "Choose a base hair color:", "Character Preference","#"+human_target.hair_color) as color|null
@@ -42,4 +48,13 @@
 	if(!do_after(usr, 30, target = human_target))
 		return
 	playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5)
-	human_target.update_hair()
+	human_target.update_hair()
+
+	//SKYRAT EDIT ADDITION
+	uses--
+
+/obj/item/dyespray/examine(mob/user)
+	. = ..()
+	. += "It has [uses] uses left."
+
+	//SKYRAT EDIT END

code/game/objects/items/plushes.dm

@@ -657,6 +657,34 @@
 	item_state = "moffplush"
 	squeak_override = list('modular_citadel/sound/voice/scream_moth.ogg' = 1)
 
+/obj/item/toy/plush/mothplushie/moffplush/safetymoth
+	name = "Safety Moth"
+	desc = "A limited edition Safety Moth™ plush, Can you collect them all?"
+	icon_state = "safetymoth"
+	item_state = "safetymoth"
+	squeak_override = list('modular_citadel/sound/voice/scream_moth.ogg' = 1)
+
+/obj/item/toy/plush/mothplushie/moffplush/safetymoth_engineer
+	name = "Engineer Safety Moth"
+	desc = "A limited edition Engineer Safety Moth™ plush, Can you collect them all?"
+	icon_state = "safetymoth_engineer"
+	item_state = "safetymoth_engineer"
+	squeak_override = list('modular_citadel/sound/voice/scream_moth.ogg' = 1)
+
+/obj/item/toy/plush/mothplushie/moffplush/safetymoth_doctor
+	name = "Doctor Safety Moth"
+	desc = "A limited edition Doctor Safety Moth™ plush, Can you collect them all?"
+	icon_state = "safetymoth_doctor"
+	item_state = "safetymoth_doctor"
+	squeak_override = list('modular_citadel/sound/voice/scream_moth.ogg' = 1)
+
+/obj/item/toy/plush/mothplushie/moffplush/Moffy
+	name = "Chef Moffy plushie"
+	desc = "A rebranded Safety Moth™ plush by there sister company Moffy's Pizzeria Entertainment™"
+	icon_state = "Moffy"
+	item_state = "Moffy"
+	squeak_override = list('modular_citadel/sound/voice/scream_moth.ogg' = 1)
+
 /obj/item/toy/plush/xeno
 	name = "xenohybrid plushie"
 	desc = "An adorable stuffed toy that resmembles a xenomorphic crewmember."
@@ -766,6 +794,15 @@
 	item_state = "kenk"
 	squeak_override = list('modular_citadel/sound/voice/merp.ogg' = 1)
 
+/obj/item/toy/plush/enchanted
+	name = "glowing book plushie"
+	desc = "This book is so powerful, you can't open it."
+	young = TRUE
+	icon_state = "bookenchanted"
+	item_state = "bookenchanted"
+	squeak_override = list('hyperstation/sound/effects/enchant.ogg' = 1)
+	attack_verb = list("enchants", "mystifies", "disenchants", "fails to enchant", "doesn't have enough XP to enchant", "bonks")
+
 /obj/item/toy/plush/sergal
 	name = "sergal plushie"
 	desc = "An adorable stuffed plushie that resembles a sagaru."
@@ -948,6 +985,13 @@
 	icon_state = "marisol"
 	item_state = "marisol"
 
+/obj/item/toy/plush/mammal/freddy
+	name = "felix fastbear plushie"
+	desc = "An adorable bear plushie that resembles felix fastbear from Moffy's Pizzeria Entertainment™"
+	icon_state = "freddy"
+	item_state = "freddy"
+	squeak_override = list('sound/items/toysqueak1.ogg' = 1)
+
 /obj/item/toy/plush/catgirl
 	name = "feline plushie"
 	desc = "An adorable stuffed toy that resembles a feline."

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -49,6 +49,13 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 		new/datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, one_per_turf = TRUE, on_floor = TRUE) \
 		)), \
 	//END OF CIT CHANGES
+	new/datum/stack_recipe_list("bench", \
+		list( \
+		new/datum/stack_recipe("bench (middle)", /obj/structure/chair/bench/metal, one_per_turf = TRUE, on_floor = TRUE), \
+		new/datum/stack_recipe("bench (left)", /obj/structure/chair/bench/metal/left, one_per_turf = TRUE, on_floor = TRUE), \
+		new/datum/stack_recipe("bench (right)", /obj/structure/chair/bench/metal/right, one_per_turf = TRUE, on_floor = TRUE), \
+		)), \
+	null, \
 	new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
 	null, \
 	//add this when I can find a way to make them easily constructible > new/datum/stack_recipe("sink", /obj/structure/sink, 2, one_per_turf = TRUE, on_floor = TRUE),

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

@@ -177,6 +177,24 @@
 	icon_state = "cheeseburgerbackpack"
 	item_state = "cheeseburgerbackpack"
 
+/obj/item/storage/backpack/lambent
+	name = "holostorage drone"
+	desc = "A small drone capable of digitizing matter and remaking it on the fly for incredibly-compressed storage, beyond the limits of Bluespace. It follows it's owner closeby."
+	icon_state = "lambentbackpack"
+	item_state = "lambentbackpack"
+	//component_type
+	resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+	alternate_worn_layer = BODY_BEHIND_LAYER //So the drone appears behind the wearer
+
+/obj/item/storage/backpack/lambent/dropped(mob/user)
+	src.icon_state = "lambentbackpack_off"
+	playsound(user, 'sound/items/fulext_deploy.wav', 50, 1)
+
+/obj/item/storage/backpack/lambent/pickup(mob/living/user)
+	src.icon_state = "lambentbackpack"
+	playsound(user, 'sound/items/dronedeploy.ogg', 50, 1)
+
+
 /*
  * Satchel Types
  */
@@ -195,6 +213,23 @@
 /obj/item/storage/backpack/satchel/leather/withwallet/PopulateContents()
 	new /obj/item/storage/wallet/random(src)
 
+/obj/item/storage/backpack/satchel/lambent
+	name = "holostorage drone"
+	desc = "A small drone capable of digitizing matter and remaking it on the fly for incredibly-compressed storage, beyond the limits of Bluespace. It follows it's owner closeby."
+	icon_state = "lambentsatchel"
+	item_state = "lambentsatchel"
+	//component_type
+	resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+	alternate_worn_layer = BODY_BEHIND_LAYER //So the drone appears behind the wearer
+
+/obj/item/storage/backpack/satchel/lambent/dropped(mob/user)
+	src.icon_state = "lambentsatchel_off"
+	playsound(user, 'sound/items/fulext_deploy.wav', 50, 1)
+
+/obj/item/storage/backpack/satchel/lambent/pickup(mob/living/user)
+	src.icon_state = "lambentsatchel"
+	playsound(user, 'sound/items/dronedeploy.ogg', 50, 1)
+
 /obj/item/storage/backpack/satchel/eng
 	name = "industrial satchel"
 	desc = "A tough satchel with extra pockets."
@@ -340,6 +375,23 @@
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_combined_w_class = 30
 
+/obj/item/storage/backpack/duffelbag/lambent
+	name = "holostorage drone"
+	desc = "A small drone capable of digitizing matter and remaking it on the fly for incredibly-compressed storage, beyond the limits of Bluespace. It follows it's owner closeby."
+	icon_state = "lambentduffel"
+	item_state = "lambentduffel"
+	//component_type
+	resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+	alternate_worn_layer = BODY_BEHIND_LAYER //So the drone appears behind the wearer
+
+/obj/item/storage/backpack/duffelbag/lambent/dropped(mob/user)
+	src.icon_state = "lambentduffel_off"
+	playsound(user, 'sound/items/fulext_deploy.wav', 50, 1)
+
+/obj/item/storage/backpack/duffelbag/lambent/pickup(mob/living/user)
+	src.icon_state = "lambentduffel"
+	playsound(user, 'sound/items/dronedeploy.ogg', 50, 1)
+
 /obj/item/storage/backpack/duffelbag/captain
 	name = "captain's duffel bag"
 	desc = "A large duffel bag for holding extra captainly goods."
@@ -365,7 +417,7 @@
 	new /obj/item/cautery(src)
 	new /obj/item/surgical_drapes(src)
 	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/razor(src)
+	//new /obj/item/razor(src)
 	new /obj/item/reagent_containers/medspray/sterilizine(src)
 
 /obj/item/storage/backpack/duffelbag/sec

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

@@ -299,6 +299,7 @@
 	name = "industrial welding tool"
 	desc = "A slightly larger welder with a larger tank."
 	icon_state = "indwelder"
+	item_state = "indwelder"
 	max_fuel = 40
 	materials = list(MAT_GLASS=60)
 
@@ -315,6 +316,7 @@
 	name = "emergency welding tool"
 	desc = "A miniature welder used during emergencies."
 	icon_state = "miniwelder"
+	item_state = "miniwelder"
 	max_fuel = 10
 	w_class = WEIGHT_CLASS_TINY
 	materials = list(MAT_METAL=30, MAT_GLASS=10)

code/game/objects/structures/mirror.dm

@@ -14,6 +14,7 @@
 	if(icon_state == "mirror_broke" && !broken)
 		obj_break(null, mapload)
 
+/* SKYRAT EDIT REMOVAL
 /obj/structure/mirror/attack_hand(mob/user)
 	. = ..()
 	if(.)
@@ -44,7 +45,7 @@
 			H.hair_style = new_style
 
 		H.update_hair()
-
+*/
 /obj/structure/mirror/examine_status(mob/user)
 	if(broken)
 		return // no message spam

code/game/objects/structures/signs/_signs.dm

@@ -133,4 +133,9 @@
 /obj/structure/sign/logo/kinaris
 	name = "kinaris logo"
 	desc = "The Kinaris corprate logo. Radiant."
-	icon_state = "kinaris_sign1"
+	icon_state = "kinaris_sign1"
+
+/obj/structure/sign/logo/cpr
+	name = "Challenge Pissing Room"
+	desc = "The league of challenge pissing"
+	icon_state = "CPR_sign1"