From 6a73abfe32da5c191cd72743e1b9fe8880b8e930 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sun, 20 Oct 2019 23:52:06 +0300 Subject: [PATCH] Adds ASSU suit+helmet and loadout stuff Also adds newlines reeeeeeeeeeee --- .../code/modules/client/loadout/_service.dm | 16 +++++++++++++++- .../code/modules/clothing/head/head.dm | 11 ++++++++++- .../code/modules/clothing/suits/suits.dm | 15 ++++++++++++++- modular_citadel/icons/mob/clothing/assu.dmi | Bin 0 -> 1078 bytes modular_citadel/icons/obj/clothing/assu.dmi | Bin 0 -> 593 bytes 5 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 modular_citadel/icons/mob/clothing/assu.dmi create mode 100644 modular_citadel/icons/obj/clothing/assu.dmi diff --git a/modular_citadel/code/modules/client/loadout/_service.dm b/modular_citadel/code/modules/client/loadout/_service.dm index 062e22f966..7872ddcf99 100644 --- a/modular_citadel/code/modules/client/loadout/_service.dm +++ b/modular_citadel/code/modules/client/loadout/_service.dm @@ -4,6 +4,20 @@ path = /obj/item/clothing/under/color/grey restricted_roles = list("Assistant") +/datum/gear/neetsuit + name = "ASSU suit" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/assu_suit + restricted_roles = list("Assistant") + cost = 2 + +/datum/gear/neethelm + name = "ASSU helmet" + category = SLOT_HEAD + path = /obj/item/clothing/head/assu_helmet + restricted_roles = list("Assistant") + cost = 2 + /datum/gear/plushvar name = "Ratvar Plushie" category = SLOT_IN_BACKPACK @@ -16,4 +30,4 @@ category = SLOT_IN_BACKPACK path = /obj/item/toy/plush/narplush cost = 5 - restricted_roles = list("Chaplain") \ No newline at end of file + restricted_roles = list("Chaplain") diff --git a/modular_citadel/code/modules/clothing/head/head.dm b/modular_citadel/code/modules/clothing/head/head.dm index 7656766053..e15583be2c 100644 --- a/modular_citadel/code/modules/clothing/head/head.dm +++ b/modular_citadel/code/modules/clothing/head/head.dm @@ -17,4 +17,13 @@ //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 \ No newline at end of file + 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 diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 5cce40ad09..0098386929 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -40,4 +40,17 @@ 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 \ No newline at end of file + 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 diff --git a/modular_citadel/icons/mob/clothing/assu.dmi b/modular_citadel/icons/mob/clothing/assu.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2592442dc5e0dae1f493356e5fefb8a795cfa7d0 GIT binary patch literal 1078 zcmV-61j+k}P)SXe+nKqMn0 zBO@ao9v&PV9632TfZbD)00001bW%=J06^y0W&i*Hc6wA;bVOxyV{&P5bZKvH004NL zQ&w6*pqEe7;XSijyd%6L^Gj_`VUCd=~-zICc_v8es^}C0p5j=M#1tSkExl|L`t2cLBl zS+r=;qD6}q{VvUY!SLoM?&bgd{KWHuF&BWZH@B3AW2wti?mV*=+I${L7Y)erZJb zK8XTE33;AFDWLe8F!@=Q5x!5ds;9P zE`0#pe#l8W?*E}6{~iDy=5p%*IQ{7UZaKNH)035qq<#Yj>-4TKT;G|r$G zT6aSrpu=E|0Np>^{O4XHz|?f1EizkksZxOJg&x=sJ`wa$OU$ac;HZIM-f0R09wklfeXIRF3v07*qoM6N<$g2F-22LJ#7 literal 0 HcmV?d00001 diff --git a/modular_citadel/icons/obj/clothing/assu.dmi b/modular_citadel/icons/obj/clothing/assu.dmi new file mode 100644 index 0000000000000000000000000000000000000000..63788a590d55d39b4a2b907cd90e730b8746ea20 GIT binary patch literal 593 zcmV-X0gwwM|Nl=`T0B5N6ciLXIyxI0 z8%Re-9UUFr-Q5=#7Znv1A0Q+kAR9+ZOB@^=K}Sk5F(@@PH7zSECMG5xo*Qrg0004W zQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ> zRWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DY3Y?G(ICWCpWc3iHkEOv#1y- zYRJWzR+N~V3SpzFEiTQ(sZv?N)z1a&3;_QkDIU@M>OnGG#Gi~oh)V{5o;MBxK;vaa2YRK7uW#+*lB{Tkf>JR6`BTs6Rk?NKsPqd>ALL-+yv+cz$_ud z;C2okxIHdQWH$()zYTM4JqOS$EKm#|&kWpmAo|1%2K6v-pMd)g(651>1IjAJ_-R%0 z|KU%7I}u|DUm?WE_6xBF*aJGzK?KwtKn%-g