diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 041f0ba012..e222d53218 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -362,3 +362,10 @@ if(prob(3)) message += pick(" Honh honh honh!"," Honh!"," Zut Alors!") speech_args[SPEECH_MESSAGE] = trim(message) + +/obj/item/clothing/head/assu_helmet + name = "ASSU helmet" + icon_state = "assu_helmet" + item_state = "assu_helmet" + desc = "A cheap replica of old riot helmet without visor. It has \"A.S.S.U.\" written on the front." + flags_inv = HIDEHAIR diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index bc885868c5..bfc644377b 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -633,3 +633,14 @@ flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS|HEAD alternate_worn_layer = UNDER_HEAD_LAYER + +/obj/item/clothing/suit/assu_suit + name = "ASSU suit" + desc = "A cheap replica of old SWAT armor. On its back, it is written: \"Assistance Skipping Special Unit\"." + icon_state = "assu_suit" + item_state = "assu_suit" + blood_overlay_type = "armor" + body_parts_covered = CHEST|GROIN|ARMS|LEGS + flags_inv = HIDEJUMPSUIT + resistance_flags = NONE + mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 842562b007..e591ecca4d 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 38ac61f318..7d9e372282 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index c8a007041b..0037787a3d 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index fb406fb65e..c600bbd682 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/modular_citadel/code/modules/clothing/head/head.dm b/modular_citadel/code/modules/clothing/head/head.dm index e15583be2c..7656766053 100644 --- a/modular_citadel/code/modules/clothing/head/head.dm +++ b/modular_citadel/code/modules/clothing/head/head.dm @@ -17,13 +17,4 @@ //The "pocket" for the M1 helmet so you can tuck things into the elastic band /datum/component/storage/concrete/pockets/tiny/spacenam - attack_hand_interact = TRUE //So you can actually see what you stuff in there - -/obj/item/clothing/head/assu_helmet - name = "ASSU helmet" - icon = 'modular_citadel/icons/obj/clothing/assu.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/clothing/assu.dmi' - icon_state = "assu_helmet" - item_state = "assu_helmet" - desc = "A cheap replica of old riot helmet without visor. It has \"A.S.S.U.\" written on the front." - flags_inv = HIDEHAIR + attack_hand_interact = TRUE //So you can actually see what you stuff in there \ No newline at end of file diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 0098386929..5cce40ad09 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -40,17 +40,4 @@ body_parts_covered = CHEST resistance_flags = NONE mutantrace_variation = NO_MUTANTRACE_VARIATION - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = -5, "acid" = -15) //nylon sucks against acid - -/obj/item/clothing/suit/assu_suit - name = "ASSU suit" - desc = "A cheap replica of old SWAT armor. On its back, it is written: \"Assistance Skipping Special Unit\"." - icon = 'modular_citadel/icons/obj/clothing/assu.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/clothing/assu.dmi' - icon_state = "assu_suit" - item_state = "assu_suit" - blood_overlay_type = "armor" - body_parts_covered = CHEST|GROIN|ARMS|LEGS - flags_inv = HIDEJUMPSUIT - resistance_flags = NONE - mutantrace_variation = NO_MUTANTRACE_VARIATION + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = -5, "acid" = -15) //nylon sucks against acid \ No newline at end of file diff --git a/modular_citadel/icons/mob/clothing/assu.dmi b/modular_citadel/icons/mob/clothing/assu.dmi deleted file mode 100644 index 2592442dc5..0000000000 Binary files a/modular_citadel/icons/mob/clothing/assu.dmi and /dev/null differ diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi index 8e8b2bd759..0b8ccf9786 100644 Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ diff --git a/modular_citadel/icons/obj/clothing/assu.dmi b/modular_citadel/icons/obj/clothing/assu.dmi deleted file mode 100644 index 63788a590d..0000000000 Binary files a/modular_citadel/icons/obj/clothing/assu.dmi and /dev/null differ