repairing x3

Dripstation-Dev · Feb 16, 2024 · 5e03327 · 5e03327
1 parent 0464fbc
commit 5e03327
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/modular_dripstation/code/modules/clothing/combatrig.dm b/modular_dripstation/code/modules/clothing/combatrig.dm
@@ -964,15 +964,15 @@
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/bloodred/waffle/unathi/breach
 	//mutantrace_variation = MUTANTRACE_VARIATION
 
-/obj/item/clothing/suit/space/hardsuit/syndi/bloodred/waffle/unathi/breach/equipped(mob/living/carbon/human/user, slot)
-	..()
-	if(slot == ITEM_SLOT_OCLOTHING)
-		RegisterSignal(user, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
-
-/obj/item/clothing/suit/space/hardsuit/syndi/bloodred/waffle/unathi/breach/dropped(mob/living/carbon/human/user, slot)
-	..()
-	if(slot == ITEM_SLOT_OCLOTHING)
-		UnregisterSignal(user, COMSIG_ATOM_ATTACK_HAND)
+///obj/item/clothing/suit/space/hardsuit/syndi/bloodred/waffle/unathi/breach/equipped(mob/living/carbon/human/user, slot)
+//	..()
+//	if(slot == ITEM_SLOT_OCLOTHING)
+//		RegisterSignal(user, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
+
+///obj/item/clothing/suit/space/hardsuit/syndi/bloodred/waffle/unathi/breach/dropped(mob/living/carbon/human/user, slot)
+//	..()
+//	if(slot == ITEM_SLOT_OCLOTHING)
+//		UnregisterSignal(user, COMSIG_ATOM_ATTACK_HAND)
 
 ///obj/item/clothing/suit/space/hardsuit/syndi/bloodred/waffle/unathi/breach/proc/on_attack_hand(atom/target, mob/living/carbon/human/user, proximity)//don`t work
 //	if(proximity) //no telekinetic breacher attack

diff --git a/modular_dripstation/code/modules/clothing/department/command.dm b/modular_dripstation/code/modules/clothing/department/command.dm
@@ -194,14 +194,14 @@
 
 /obj/item/clothing/gloves/color/captain
 	icon = 'modular_dripstation/icons/obj/clothing/gloves.dmi'
-	mob_overlay_icon = 'modular_dripstation/icons/mob/clothing/gloves.dmi'
+	mob_overlay_icon = 'modular_dripstation/icons/mob/clothing/hands.dmi'
 
 /obj/item/clothing/head/caphat
 	icon = 'modular_dripstation/icons/obj/clothing/hats.dmi'
 	mob_overlay_icon = 'modular_dripstation/icons/mob/clothing/hats.dmi'	
 
 /obj/item/clothing/head/caphat/parade
-	icon = 'icons/obj/clothing/hats.dmi'
+	icon = 'icons/obj/clothing/hats/hats.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/head/head.dmi'
 
 /obj/item/clothing/head/beret/captain

diff --git a/modular_dripstation/code/modules/clothing/department/engineering.dm b/modular_dripstation/code/modules/clothing/department/engineering.dm
@@ -2,8 +2,8 @@
 /obj/item/clothing/suit/hazardvest
 	icon = 'modular_dripstation/icons/obj/clothing/suits.dmi'
 	mob_overlay_icon = 'modular_dripstation/icons/mob/clothing/suits.dmi'
-	lefthand_file = 'modular_dripstation/icons/mob/inhands/suits_lefthand.dmi'
-	righthand_file = 'modular_dripstation/icons/mob/inhands/suits_righthand.dmi'
+	//lefthand_file = 'modular_dripstation/icons/mob/inhands/suits_lefthand.dmi'
+	//righthand_file = 'modular_dripstation/icons/mob/inhands/suits_righthand.dmi'
 
 /obj/item/clothing/suit/hazardvest/white
 	name = "white hazard vest"

diff --git a/modular_dripstation/code/modules/clothing/department/research.dm b/modular_dripstation/code/modules/clothing/department/research.dm
@@ -82,7 +82,7 @@
 	icon_state = "coatrobotics"
 	icon = 'modular_dripstation/icons/obj/clothing/suits.dmi'
 	mob_overlay_icon = 'modular_dripstation/icons/mob/clothing/suits.dmi'	
-	allowed = list(/obj/item/analyzer, /obj/item/jawsoflife, /obj/item/screwdriver, /obj/item/wirecutters, /obj/item/weldingtool, /obj/item/wrench, /obj/item/crowbar, /obj/item/handdrill,  /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/beaker, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/box/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant)
+	allowed = list(/obj/item/analyzer, /obj/item/jawsoflife, /obj/item/screwdriver, /obj/item/wirecutters, /obj/item/weldingtool, /obj/item/wrench, /obj/item/crowbar, /obj/item/handdrill,  /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/beaker, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/science/robotics
 
 /obj/item/clothing/head/hooded/winterhood/science/robotics
@@ -121,8 +121,8 @@
 					/obj/item/clothing/suit/hooded/wintercoat/science = 3,
 					/obj/item/clothing/suit/toggle/labcoat = 5,					
 					/obj/item/clothing/suit/toggle/labcoat/science = 5,
-					/obj/item/clothing/suit/poncho/sci = 2,
-					/obj/item/clothing/suit/toggle/bomber/scibomber = 2,
+					/*/obj/item/clothing/suit/poncho/sci = 2,
+					/obj/item/clothing/suit/toggle/bomber/scibomber = 2,*/
 					/obj/item/clothing/head/beret/sci = 3,					
 					/obj/item/clothing/shoes/sneakers/white = 3,
 					/obj/item/clothing/shoes/sandal/white = 3,

diff --git a/modular_dripstation/code/modules/clothing/department/security.dm b/modular_dripstation/code/modules/clothing/department/security.dm
@@ -232,8 +232,8 @@
 					/obj/item/clothing/under/rank/security/corporate = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/security = 3,					
 					/obj/item/clothing/suit/armor/vest/secmiljacket = 2,
-					/obj/item/clothing/suit/toggle/bomber/secbomber/soft = 2,
-					/obj/item/clothing/suit/poncho/sec = 2,					
+					/*/obj/item/clothing/suit/toggle/bomber/secbomber/soft = 2,
+					/obj/item/clothing/suit/poncho/sec = 2,*/					
 					/obj/item/clothing/shoes/jackboots = 3,
 					/obj/item/clothing/shoes/jackboots/jacksandal = 3,
 					/obj/item/clothing/shoes/xeno_wraps/jackboots = 3,

diff --git a/modular_dripstation/code/modules/clothing/department/supply.dm b/modular_dripstation/code/modules/clothing/department/supply.dm
@@ -68,7 +68,7 @@
 	armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 10, BOMB = 10, BIO = 0, RAD = 0, FIRE = 50, ACID = 50, WOUND = 5)
 	cold_protection = CHEST|GROIN|LEGS|ARMS
 	heat_protection = CHEST|GROIN|LEGS|ARMS
-	allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant, /obj/item/toy, /obj/item/storage/box/fancy/cigarettes, /obj/item/lighter, /obj/item/boxcutter, /obj/item/export_scanner, /obj/item/cargo_teleporter, /obj/item/melee/classic_baton)
+	allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/boxcutter, /obj/item/export_scanner, /obj/item/cargo_teleporter, /obj/item/melee/classic_baton)
 
 // ###### CARGO STAFF ######
 
@@ -81,4 +81,4 @@
 	mob_overlay_icon = 'modular_dripstation/icons/mob/clothing/hats.dmi'
 
 obj/item/clothing/suit/hooded/wintercoat/cargo
-	allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant, /obj/item/toy, /obj/item/storage/box/fancy/cigarettes, /obj/item/lighter, /obj/item/boxcutter, /obj/item/export_scanner, /obj/item/cargo_teleporter)
+	allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/boxcutter, /obj/item/export_scanner, /obj/item/cargo_teleporter)
diff --git a/modular_dripstation/code/modules/clothing/voidsuit.dm b/modular_dripstation/code/modules/clothing/voidsuit.dm
@@ -245,9 +245,9 @@
 
 
 /obj/item/clothing/head/helmet/space/plasmaman
-	icon = 'icons/obj/clothing/hats.dmi'
+	icon = 'icons/obj/clothing/hats/hats.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/head/head.dmi'
 
 /obj/item/clothing/suit/space/eva/plasmaman
-	icon = 'icons/obj/clothing/suits.dmi'
+	icon = 'icons/obj/clothing/suits/suits.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/suit/suit.dmi'