diff --git a/modular_darkpack/modules/ert/code/items/first_team.dm b/modular_darkpack/modules/ert/code/items/first_team.dm index 022ae62ddde9..d4b014355748 100644 --- a/modular_darkpack/modules/ert/code/items/first_team.dm +++ b/modular_darkpack/modules/ert/code/items/first_team.dm @@ -63,6 +63,25 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF +//------------HELMET------------ +/obj/item/clothing/mask/gas/darkpack_ert + icon_state = "gas_tactical" + icon = 'modular_darkpack/modules/ert/icons/clothing.dmi' + inhand_icon_state = null + worn_icon = 'modular_darkpack/modules/ert/icons/worn.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDEEYES | HIDEEARS | HIDEHAIR | HIDESNOUT + visor_flags_inv = 0 + flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF + visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF + fishing_modifier = 2 + pepper_tint = FALSE + +/obj/item/clothing/mask/gas/darkpack_ert/pentex + name = "\improper Corporate Gas Mask" + desc = "Provides protection from smoke, smog, and whatever biological horror is rampaging through your clandestine laboratory." + icon_state = "gas_pentex" + //------------ARMOR------------ /obj/item/clothing/suit/vampire/darkpack_ert diff --git a/modular_darkpack/modules/ert/code/items/national_guard.dm b/modular_darkpack/modules/ert/code/items/national_guard.dm new file mode 100644 index 000000000000..8c5b2e2bb359 --- /dev/null +++ b/modular_darkpack/modules/ert/code/items/national_guard.dm @@ -0,0 +1,24 @@ +/obj/item/clothing/mask/gas/darkpack_ert/guard_mask + name = "\improper Military Gas Mask" + desc = "A close-fitting tactical gas mask designed to protect against biological hazards and public accountability." + icon_state = "gas_tactical" + +/obj/item/clothing/head/vampire/darkpack_ert/guard_helmet + name = "\improper National Guard Helmet" + desc = "Standard issue C.A.N.G helmet modified for riot supression. Provides superior protection against blunt force." //California Army National Guard + icon_state = "tactical" + flags_inv = HIDEEARS|HIDEHAIR + armor_type = /datum/armor/army_helmet + masquerade_violating = TRUE + +/obj/item/clothing/suit/vampire/darkpack_ert/guard_vest + name = "\improper National Guard Vest" + desc = "Standard issue C.A.N.G vest modified for riot supression. Provides great protection against blunt force." + icon_state = "tactical_vest" + inhand_icon_state = null + w_class = WEIGHT_CLASS_BULKY + armor_type = /datum/armor/highly_protective_vest + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED) diff --git a/modular_darkpack/modules/ert/code/outfits/national_guard_outfits.dm b/modular_darkpack/modules/ert/code/outfits/national_guard_outfits.dm index b4b477b8e68f..84d153885e3d 100644 --- a/modular_darkpack/modules/ert/code/outfits/national_guard_outfits.dm +++ b/modular_darkpack/modules/ert/code/outfits/national_guard_outfits.dm @@ -7,15 +7,17 @@ r_pocket = /obj/item/flashlight/seclite l_pocket = /obj/item/vamp/keys/police/federal shoes = /obj/item/clothing/shoes/vampire/jackboots - suit = /obj/item/clothing/suit/vampire/vest + suit = /obj/item/clothing/suit/vampire/darkpack_ert/guard_vest id = /obj/item/card/lieutenant r_hand = /obj/item/gun/ballistic/automatic/darkpack/autoshotgun + back = /obj/item/storage/backpack/satchel backpack_contents = list( /obj/item/ammo_box/magazine/darkpackautoshot = 1, /obj/item/ammo_box/darkpack/c12g/buck = 1, /obj/item/knife/vamp = 1, /obj/item/storage/medkit/darkpack/ifak = 1, /obj/item/megaphone = 1, + /obj/item/clothing/mask/gas/darkpack_ert/guard_mask = 1, ) /datum/outfit/job/vampire/ert/national_guard/medic @@ -29,9 +31,11 @@ shoes = /obj/item/clothing/shoes/vampire/jackboots belt = /obj/item/defibrillator/compact/loaded suit = /obj/item/clothing/suit/vampire/labcoat/director - head = /obj/item/clothing/head/beret + head = /obj/item/clothing/head/vampire/darkpack_ert/guard_helmet + mask = /obj/item/clothing/mask/gas/darkpack_ert/guard_mask id = /obj/item/card/first_aid r_hand = /obj/item/gun/ballistic/automatic/darkpack/mp5 + back = /obj/item/storage/backpack/satchel backpack_contents = list( /obj/item/ammo_box/magazine/darkpack9mp5 = 1, /obj/item/storage/medkit/darkpack/doctor = 1, @@ -50,9 +54,11 @@ l_pocket = /obj/item/ammo_box/magazine/darkpackaug shoes = /obj/item/clothing/shoes/vampire/jackboots belt = /obj/item/gun/ballistic/automatic/darkpack/aug - suit = /obj/item/clothing/suit/vampire/vest/army - head = /obj/item/clothing/head/vampire/army + mask = /obj/item/clothing/mask/gas/darkpack_ert/guard_mask + suit = /obj/item/clothing/suit/vampire/darkpack_ert/guard_vest + head = /obj/item/clothing/head/vampire/darkpack_ert/guard_helmet id = /obj/item/card/swat + back = /obj/item/storage/backpack/satchel backpack_contents = list( /obj/item/ammo_box/magazine/darkpackaug = 1, /obj/item/grenade/frag = 1, @@ -68,6 +74,7 @@ gloves = /obj/item/clothing/gloves/vampire/work r_pocket = /obj/item/lighter shoes = /obj/item/clothing/shoes/vampire/jackboots + mask = /obj/item/clothing/mask/gas/darkpack_ert/guard_mask suit = /obj/item/clothing/suit/vampire/eod head = /obj/item/clothing/head/vampire/eod id = /obj/item/card/swat @@ -90,8 +97,9 @@ r_pocket = /obj/item/flashlight/seclite l_pocket = /obj/item/ammo_box/magazine/m9mm shoes = /obj/item/clothing/shoes/vampire/jackboots - suit = /obj/item/clothing/suit/vampire/vest/army + suit = /obj/item/clothing/suit/vampire/darkpack_ert/guard_vest head = /obj/item/clothing/head/beret + mask = /obj/item/clothing/mask/gas/darkpack_ert/guard_mask id = /obj/item/card/swat backpack_contents = list( /obj/item/ammo_box/magazine/darkpack556 = 1, diff --git a/modular_darkpack/modules/ert/icons/48x32weapons.dmi b/modular_darkpack/modules/ert/icons/48x32weapons.dmi index e22880c27f1a..bab8764b1a9e 100644 Binary files a/modular_darkpack/modules/ert/icons/48x32weapons.dmi and b/modular_darkpack/modules/ert/icons/48x32weapons.dmi differ diff --git a/modular_darkpack/modules/ert/icons/clothing.dmi b/modular_darkpack/modules/ert/icons/clothing.dmi index 052622eb423b..7b0c11bdb159 100644 Binary files a/modular_darkpack/modules/ert/icons/clothing.dmi and b/modular_darkpack/modules/ert/icons/clothing.dmi differ diff --git a/modular_darkpack/modules/ert/icons/onfloor.dmi b/modular_darkpack/modules/ert/icons/onfloor.dmi index f579ab1996fa..18d3fbfedd68 100644 Binary files a/modular_darkpack/modules/ert/icons/onfloor.dmi and b/modular_darkpack/modules/ert/icons/onfloor.dmi differ diff --git a/modular_darkpack/modules/ert/icons/worn.dmi b/modular_darkpack/modules/ert/icons/worn.dmi index bd0d5c906a26..589f56f1fb8b 100644 Binary files a/modular_darkpack/modules/ert/icons/worn.dmi and b/modular_darkpack/modules/ert/icons/worn.dmi differ diff --git a/modular_darkpack/modules/vip_areas/code/bouncer_roles/bouncer_endron_role.dm b/modular_darkpack/modules/vip_areas/code/bouncer_roles/bouncer_endron_role.dm index fbec2425c412..8c778cab82af 100644 --- a/modular_darkpack/modules/vip_areas/code/bouncer_roles/bouncer_endron_role.dm +++ b/modular_darkpack/modules/vip_areas/code/bouncer_roles/bouncer_endron_role.dm @@ -22,7 +22,7 @@ suits = list(/obj/item/clothing/suit/vampire/vest) glasses = list(/obj/item/clothing/glasses/vampire/sun) hats = list(/obj/item/clothing/head/beret/black) - masks = list(/obj/item/clothing/mask/gas/explorer) + masks = list(/obj/item/clothing/mask/gas/darkpack_ert/pentex) /datum/socialrole/bouncer/endron/endron_lab_2 bouncer_weapon_type = /obj/item/gun/ballistic/automatic/darkpack/mp5 @@ -34,7 +34,7 @@ suits = list(/obj/item/clothing/suit/vampire/vest) glasses = list(/obj/item/clothing/glasses/vampire/sun) hats = list(/obj/item/clothing/head/beret/black) - masks = list(/obj/item/clothing/mask/gas/explorer) + masks = list(/obj/item/clothing/mask/gas/darkpack_ert/pentex) /datum/socialrole/bouncer/endron/endron_2 bouncer_weapon_type = /obj/item/gun/ballistic/automatic/pistol/darkpack/deagle diff --git a/tgstation.dme b/tgstation.dme index 19bf117cf5b9..2c603d53c2c3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7128,6 +7128,7 @@ #include "modular_darkpack\modules\ert\code\swat.dm" #include "modular_darkpack\modules\ert\code\team.dm" #include "modular_darkpack\modules\ert\code\items\first_team.dm" +#include "modular_darkpack\modules\ert\code\items\national_guard.dm" #include "modular_darkpack\modules\ert\code\items\swat_items.dm" #include "modular_darkpack\modules\ert\code\outfits\first_team_outfits.dm" #include "modular_darkpack\modules\ert\code\outfits\national_guard_outfits.dm"