Skip to content

National Guard Revamp: CBRN #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SELFHELL wants to merge 4 commits into
base: master
Choose a base branch
from
Open

National Guard Revamp: CBRN #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9053f0c
Initial Icons
SELFHELL Mar 2, 2026
9deffc4
First set of items
SELFHELL Mar 3, 2026
0fb5026
storage adjustment
SELFHELL Mar 4, 2026
4a180f7
Update bouncer_endron_role.dm
SELFHELL Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions modular_darkpack/modules/ert/code/items/first_team.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 24 additions & 0 deletions modular_darkpack/modules/ert/code/items/national_guard.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
18 changes: 13 additions & 5 deletions modular_darkpack/modules/ert/code/outfits/national_guard_outfits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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
Expand All @@ -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,
Expand Down
Binary file modified modular_darkpack/modules/ert/icons/48x32weapons.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_darkpack/modules/ert/icons/clothing.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_darkpack/modules/ert/icons/onfloor.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_darkpack/modules/ert/icons/worn.dmi
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions modular_darkpack/modules/vip_areas/code/bouncer_roles/bouncer_endron_role.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// DM Environment file for tgstation.dme.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\drugs\code\bloodpacks\methpack.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\drugs\code\bloodpacks\cokepack.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\drugs\code\bloodpacks\morphpack.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\drugs\code\bloodpacks\bloodpack_adulteration.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\werewolf_the_apocalypse\code\old\gifts.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\werewolf_the_apocalypse\code\gifts\tribes\tribes.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\weather\code\weather.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\computers\code\computer.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\computers\code\app.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\computers\code\app_types.dm.
// All manual changes should be made outside the BEGIN_ and END_ blocks.
// New source code should be placed in .dm files: choose File/New --> Code File.

Expand Down Expand Up @@ -7129,6 +7129,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"
Expand Down
Loading