modularizes autodrobe

IrisSS13 · Jan 28, 2025 · 0028061 · 0028061
1 parent 73a164f
commit 0028061
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/code/_globalvars/arcade.dm b/code/_globalvars/arcade.dm
@@ -67,7 +67,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 	/obj/item/toy/eldritch_book = 2,
 	/obj/item/storage/box/heretic_box = 1,
 	/obj/item/toy/foamfinger = 2,
-	/obj/item/toy/groan_tube = 2,
+	/obj/item/toy/groan_tube = 2, // IRIS EDIT
 	/obj/item/clothing/glasses/trickblindfold = 2,
 	/obj/item/clothing/mask/party_horn = 2,
 	/obj/item/storage/box/party_poppers = 2,

diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
@@ -48,18 +48,6 @@ GLOBAL_LIST_INIT(autodrobe_costumes_items, list(
 	/obj/item/clothing/under/costume/gi = 4,
 	/obj/item/clothing/head/soft/propeller_hat = 3,
 	/obj/item/clothing/neck/bowtie/rainbow = 3,
-	//IRIS EDIT ADDITION BEGIN - PROVENANCE_COSTUMES
-	/obj/item/clothing/suit/patho/thanatologist = 1,
-	/obj/item/clothing/shoes/patho/thanatologist = 1,
-	/obj/item/clothing/suit/patho/physician = 1,
-	/obj/item/clothing/shoes/patho/physician = 1,
-	/obj/item/clothing/suit/patho/miraculist = 1,
-	/obj/item/clothing/shoes/patho/miraculist = 1,
-	/obj/item/clothing/mask/patho/orderly = 2,
-	/obj/item/clothing/suit/patho/orderly = 2,
-	/obj/item/clothing/mask/patho/tragedian = 2,
-	/obj/item/clothing/suit/patho/tragedian = 2,
-	//IRIS EDIT ADDITION END
 ))
 
 GLOBAL_LIST_INIT(autodrobe_supernatural_items, list(

diff --git a/modular_iris/modules/modular_vending/code/autodrobe.dm b/modular_iris/modules/modular_vending/code/autodrobe.dm
@@ -8,6 +8,16 @@
 				/obj/item/clothing/under/costume/iris/teto = 1,
 				/obj/item/clothing/head/costume/iris/miku_hat = 1,
 				/obj/item/clothing/head/costume/iris/teto_hat = 1,
+				/obj/item/clothing/suit/patho/thanatologist = 1, // PROVENANCE_COSTUMES START
+				/obj/item/clothing/shoes/patho/thanatologist = 1,
+				/obj/item/clothing/suit/patho/physician = 1,
+				/obj/item/clothing/shoes/patho/physician = 1,
+				/obj/item/clothing/suit/patho/miraculist = 1,
+				/obj/item/clothing/shoes/patho/miraculist = 1,
+				/obj/item/clothing/mask/patho/orderly = 2,
+				/obj/item/clothing/suit/patho/orderly = 2,
+				/obj/item/clothing/mask/patho/tragedian = 2,
+				/obj/item/clothing/suit/patho/tragedian = 2, // PROVENANCE_COSTUMES END
 			),
 		),
 	)
diff --git a/tgstation.dme b/tgstation.dme
@@ -6650,10 +6650,10 @@
 #include "modular_iris\master_files\code\modules\client\preferences\say_prefs.dm"
 #include "modular_iris\master_files\code\modules\mob\living\carbon\human\butts.dm"
 #include "modular_iris\master_files\code\modules\mob\living\carbon\human\human.dm"
+#include "modular_iris\modules\aesthetics\indestructible_things\indestructible.dm"
 #include "modular_iris\modules\ai_lawsets\code\datums\lawsets.dm"
 #include "modular_iris\modules\ai_lawsets\code\datums\module_designs.dm"
 #include "modular_iris\modules\ai_lawsets\code\objects\law_modules.dm"
-#include "modular_iris\modules\aesthetics\indestructible_things\indestructible.dm"
 #include "modular_iris\modules\bodyparts\code\_mutant_bodyparts.dm"
 #include "modular_iris\modules\customization\game\objects\items\plushes.dm"
 #include "modular_iris\modules\customization\modules\client\augment\organs.dm"