appeasement 2

cmss13-devs · Jan 11, 2025 · 6707011 · 6707011
1 parent 4d4526d
commit 6707011
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm
@@ -125,7 +125,6 @@
 	item_icons = list(
 		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
 	)
-	flags_atom = NO_GAMEMODE_SKIN
 
 /obj/item/clothing/head/beret/cm/tan/Initialize(mapload, ...)
 	. = ..()

diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
@@ -17,27 +17,21 @@
 		/obj/item/reagent_container/pill,
 		/obj/item/storage/pill_bottle,
 		/obj/item/paper,
+		/obj/item/tool/surgery/surgical_line,
+		/obj/item/tool/surgery/synthgraft,
+		/obj/item/tool/surgery/hemostat,
+		/obj/item/tool/surgery/cautery,
+		/obj/item/tool/surgery/retractor,
+		/obj/item/tool/surgery/surgicaldrill,
+		/obj/item/tool/surgery/circular_saw,
+		/obj/item/tool/surgery/scalpel,
 
-		/obj/item/weapon/gun/,
 		/obj/item/storage/fancy/cigarettes,
 		/obj/item/tool/lighter,
 		/obj/item/weapon/baton,
 		/obj/item/restraint/handcuffs,
 		/obj/item/device/binoculars,
 		/obj/item/attachable/bayonet,
-		/obj/item/storage/belt/gun/m4a3,
-		/obj/item/storage/belt/gun/m44,
-		/obj/item/storage/belt/gun/mateba,
-		/obj/item/storage/belt/gun/smartpistol,
-		/obj/item/storage/backpack/general_belt,
-
-		/obj/item/device/flashlight,
-		/obj/item/device/healthanalyzer,
-		/obj/item/device/radio,
-		/obj/item/tank/emergency_oxygen,
-		/obj/item/tool/crowbar,
-		/obj/item/tool/pen,
-		/obj/item/storage/large_holster/machete,
 
 		/obj/item/device/flashlight,
 		/obj/item/device/healthanalyzer,

diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm
@@ -517,6 +517,17 @@
 	worn_state = "pmc_jumpsuit"
 	min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
+	suit_restricted = list(
+		/obj/item/clothing/suit/storage/marine/veteran/pmc,
+		/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc,
+		/obj/item/clothing/suit/armor/vest/security,
+		/obj/item/clothing/suit/storage/hazardvest,
+		/obj/item/clothing/suit/storage/labcoat,
+		/obj/item/clothing/suit/storage/jacket/marine/,
+		/obj/item/clothing/suit/storage/CMB/trenchcoat/,
+		/obj/item/clothing/suit/storage/windbreaker/,
+		/obj/item/clothing/suit/storage/snow_suit/,
+	) //if you remove this, it allows you to wear the marine M3 armor over the pmc fatigues
 
 /obj/item/clothing/under/marine/veteran/pmc/leader
 	name = "\improper PMC command fatigues"