Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions modular_darkpack/modules/clothes/code/under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,19 @@
name = "police fatigues"
icon_state = "policeutil"

/obj/item/clothing/under/vampire/police/fbi
name = "FBI turtleneck"
desc = "The uniform of the Bureau's finest. Features durable and stretchy pants for door-kicking."
icon_state = "fbiturtleneck"

/obj/item/clothing/under/vampire/police/fbi/utility
name = "FBI fatigues"
icon_state = "fbiutil"

/obj/item/clothing/under/vampire/police/fbi/pants
name = "FBI fatigue pants"
icon_state = "fbipants"
Comment on lines +282 to +293
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/obj/item/clothing/under/vampire/police/fbi
name = "FBI turtleneck"
desc = "The uniform of the Bureau's finest. Features durable and stretchy pants for door-kicking."
icon_state = "fbiturtleneck"
/obj/item/clothing/under/vampire/police/fbi/utility
name = "FBI fatigues"
icon_state = "fbiutil"
/obj/item/clothing/under/vampire/police/fbi/pants
name = "FBI fatigue pants"
icon_state = "fbipants"
/obj/item/clothing/under/vampire/police/fbi
name = "\improper FBI turtleneck"
desc = "The uniform of the Bureau's finest. Features durable and stretchy pants for door-kicking."
icon_state = "fbiturtleneck"
/obj/item/clothing/under/vampire/police/fbi/utility
name = "\improper FBI fatigues"
icon_state = "fbiutil"
/obj/item/clothing/under/vampire/police/fbi/pants
name = "\improper FBI fatigue pants"
icon_state = "fbipants"


/obj/item/clothing/under/vampire/guard
name = "security guard uniform"
desc = "Never let the stale, spongy cake of life keep you from getting to the tasty cream filling of success."
Expand Down
Binary file modified modular_darkpack/modules/clothes/icons/clothing.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/clothes/icons/clothing_onfloor.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/clothes/icons/worn.dmi
Binary file not shown.
19 changes: 19 additions & 0 deletions modular_darkpack/modules/ert/code/fbi.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/datum/antagonist/ert/darkpack/fbi/leader
name = "FBI SWAT Lieutenant"
outfit = /datum/outfit/job/vampire/fbi_lieutenant
role = "FBI SWAT Lieutenant"

/datum/antagonist/ert/darkpack/fbi/medic
name = "FBI SWAT Field Medic"
outfit = /datum/outfit/job/vampire/fbi_medic
role = "FBI SWAT Field Medic"

/datum/antagonist/ert/darkpack/fbi/rifleman
name = "FBI SWAT Rifleman"
outfit = /datum/outfit/job/vampire/fbi_rifleman
role = "FBI SWAT Rifleman"

/datum/antagonist/ert/darkpack/fbi/marksman
name = "FBI SWAT Marksman"
outfit = /datum/outfit/job/vampire/fbi_marksman
role = "FBI SWAT Marksman"
8 changes: 8 additions & 0 deletions modular_darkpack/modules/ert/code/items/swat_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED)

/obj/item/clothing/suit/vampire/darkpack_ert/swat_armor/fbi
name = "\improper FBI SWAT vest"
icon_state = "fbivest"

/obj/item/clothing/head/vampire/darkpack_ert/swat_helmet
name = "\improper SWAT Helmet"
desc = "Modified SFPD helmet with improved performance. Isnt it great to be on the good side of police militarization?"
Expand All @@ -63,3 +67,7 @@
visor_flags_inv = HIDEFACE|HIDESNOUT
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF

/obj/item/clothing/head/vampire/darkpack_ert/swat_helmet/fbi
name = "\improper FBI SWAT Helmet"
icon_state = "fbihelmet"
93 changes: 93 additions & 0 deletions modular_darkpack/modules/ert/code/outfits/fbi_outfits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/datum/outfit/job/vampire/fbi_rifleman
name = "FBI Swat Rifleman"
ears = /obj/item/radio/headset/darkpack/police
mask = /obj/item/clothing/mask/vampire/balaclava
uniform = /obj/item/clothing/under/vampire/police/fbi/utility
gloves = /obj/item/clothing/gloves/fingerless
l_pocket = /obj/item/vamp/keys/police/federal
suit_store = /obj/item/flashlight/seclite
shoes = /obj/item/clothing/shoes/vampire/jackboots
belt = /obj/item/storage/belt/police/swat/full
suit = /obj/item/clothing/suit/vampire/darkpack_ert/swat_armor/fbi
head = /obj/item/clothing/head/vampire/darkpack_ert/swat_helmet/fbi
id = /obj/item/card/swat
r_hand = /obj/item/gun/ballistic/automatic/darkpack/mp7
backpack_contents = list(
/obj/item/ammo_box/magazine/darkpack/c46pdw/ext = 3,
/obj/item/grenade/frag = 1,
/obj/item/grenade/flashbang = 1,
/obj/item/grenade/smokebomb = 1,
/obj/item/storage/medkit/darkpack/ifak = 1,
/obj/item/restraints/handcuffs = 1,
)

/datum/outfit/job/vampire/fbi_lieutenant
name = "FBI Swat Lieutenant"
ears = /obj/item/radio/headset/darkpack/police
mask = /obj/item/clothing/mask/vampire/balaclava
glasses = /obj/item/clothing/glasses/vampire/sun
uniform = /obj/item/clothing/under/vampire/police/fbi
gloves = /obj/item/clothing/gloves/fingerless
l_pocket = /obj/item/vamp/keys/police/federal
suit_store = /obj/item/flashlight/seclite
shoes = /obj/item/clothing/shoes/vampire/jackboots
belt = /obj/item/storage/belt/police/swat/full
suit = /obj/item/clothing/suit/vampire/darkpack_ert/swat_armor/fbi
head = /obj/item/clothing/head/vampire/darkpack_ert/swat_helmet/fbi
id = /obj/item/card/lieutenant
r_hand = /obj/item/gun/ballistic/automatic/darkpack/mp7
backpack_contents = list(
/obj/item/ammo_box/magazine/darkpack/c46pdw/ext = 3,
/obj/item/grenade/frag = 1,
/obj/item/grenade/flashbang = 1,
/obj/item/grenade/smokebomb = 1,
/obj/item/storage/medkit/darkpack/ifak = 1,
/obj/item/storage/box/handcuffs = 1,
)

/datum/outfit/job/vampire/fbi_medic
name = "FBI Swat Field Medic"
ears = /obj/item/radio/headset/darkpack/police
mask = /obj/item/clothing/mask/vampire/balaclava
glasses = /obj/item/clothing/glasses/vampire/sun
uniform = /obj/item/clothing/under/vampire/police/fbi/utility
gloves = /obj/item/clothing/gloves/vampire/latex
l_pocket = /obj/item/vamp/keys/police/federal
suit_store = /obj/item/flashlight/seclite
shoes = /obj/item/clothing/shoes/vampire/jackboots
belt = /obj/item/defibrillator/compact/loaded
suit = /obj/item/clothing/suit/vampire/darkpack_ert/swat_armor/fbi
head = /obj/item/clothing/head/vampire/darkpack_ert/swat_helmet/fbi
id = /obj/item/card/first_aid
r_hand = /obj/item/gun/ballistic/automatic/darkpack/mp7
backpack_contents = list(
/obj/item/ammo_box/magazine/darkpack/c46pdw/ext = 3,
/obj/item/storage/medkit/darkpack/doctor = 1,
/obj/item/storage/medkit/darkpack/combat = 1,
/obj/item/storage/medkit/darkpack/burn = 1,
/obj/item/storage/medkit/darkpack/brute = 1,
/obj/item/restraints/handcuffs = 1,
)

/datum/outfit/job/vampire/fbi_marksman
name = "FBI Swat Marksman"
ears = /obj/item/radio/headset/darkpack/police
mask = /obj/item/clothing/mask/vampire/balaclava
glasses = /obj/item/clothing/glasses/vampire/sun
uniform = /obj/item/clothing/under/vampire/police/fbi/utility
suit = /obj/item/clothing/suit/vampire/darkpack_ert/swat_armor/fbi
head = /obj/item/clothing/head/vampire/darkpack_ert/swat_helmet/fbi
suit_store = /obj/item/flashlight/seclite
belt = /obj/item/storage/belt/police/swat/full
l_pocket = /obj/item/vamp/keys/police/federal
shoes = /obj/item/clothing/shoes/vampire
id = /obj/item/card/swat
r_hand = /obj/item/gun/ballistic/automatic/darkpack/autosniper
backpack_contents = list(
/obj/item/clothing/under/vampire/suit/female = 1,
/obj/item/binoculars = 1,
/obj/item/ammo_box/darkpack/c762x51mm = 1,
/obj/item/ammo_box/magazine/vamp762x51PSG1 = 3,
/obj/item/flashlight/seclite = 1,
/obj/item/restraints/handcuffs = 1,
)
7 changes: 7 additions & 0 deletions modular_darkpack/modules/ert/code/team.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,10 @@
rename_team = "First Team" //For when you need a death-squad on a budget
mission = "Remove all hostile anomolous entities"
polldesc = "an 'elite' FIRST Team"

/datum/ert/darkpack/fbi
leader_role = /datum/antagonist/ert/darkpack/fbi/leader
roles = list(/datum/antagonist/ert/darkpack/fbi/medic, /datum/antagonist/ert/darkpack/fbi/rifleman, /datum/antagonist/ert/darkpack/fbi/marksman)
rename_team = "FBI SWAT Unit"
mission = "Assess the situation and assist the deployed FBI Special Agents."
polldesc = "the FBI's Special Weapons and Tactics Unit"
Binary file modified modular_darkpack/modules/ert/icons/clothing.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/ert/icons/onfloor.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/ert/icons/worn.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
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\delivery\code\delivery_obj\delivery_dispensers.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\delivery\code\delivery_obj\delivery_map_defines.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\delivery\code\delivery_obj\delivery_recievers.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\delivery\code\delivery_datums.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\delivery\code\delivery_areas.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\delivery\code\_delivery_defs_gvars.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\delivery\code\delivery_objs.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\powers\code\discipline\mytherceria.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\powers\code\discipline\healer_valeren.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.
// 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 @@ -7204,12 +7204,14 @@
#include "modular_darkpack\modules\emotes\code\carbon.dm"
#include "modular_darkpack\modules\emotes\code\human.dm"
#include "modular_darkpack\modules\emotes\code\living.dm"
#include "modular_darkpack\modules\ert\code\fbi.dm"
#include "modular_darkpack\modules\ert\code\national_guard.dm"
#include "modular_darkpack\modules\ert\code\pentex_ert_roles.dm"
#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\swat_items.dm"
#include "modular_darkpack\modules\ert\code\outfits\fbi_outfits.dm"
#include "modular_darkpack\modules\ert\code\outfits\first_team_outfits.dm"
#include "modular_darkpack\modules\ert\code\outfits\national_guard_outfits.dm"
#include "modular_darkpack\modules\ert\code\outfits\swat_outfits.dm"
Expand Down
Loading