Skip to content

Commit

Permalink
aaaaargghhhh
Browse files Browse the repository at this point in the history
  • Loading branch information
meemofcourse committed Nov 4, 2023
1 parent 1765b5a commit d2e80e0
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 11 deletions.
7 changes: 6 additions & 1 deletion code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,11 @@
for(var/i in 1 to 7)
new /obj/item/ammo_box/magazine/smgm45(src)

/obj/item/storage/belt/military/bulldog/PopulateContents()
. = ..()
for(var/i in 1 to 7)
new /obj/item/ammo_box/magazine/m12g(src)

/obj/item/storage/belt/military/minutemen
name = "minutemen tactical webbing"
desc = "A set of tactical webbing worn by the Colonial Minutemen of the frontier."
Expand All @@ -454,7 +459,7 @@

/obj/item/storage/belt/military/snack/Initialize()
. = ..()
var/sponsor = pick("DonkCo", "Waffle Co.", "Roffle Co.", "Gorlax Marauders", "Tiger Cooperative")
var/sponsor = pick("Donk! Co.", "CyberSun")
desc = "A set of snack-tical webbing worn by athletes of the [sponsor] VR sports division."

/obj/item/storage/belt/military/snack/ComponentInitialize()
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/outfits/ert/frontiersmen_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
head = /obj/item/clothing/head/beret/sec/frontier/officer
ears = /obj/item/radio/headset/pirate/alt/captain
back = /obj/item/storage/backpack/satchel/leather
suit = /obj/item/clothing/suit/armor/frontier
suit_store = /obj/item/gun/ballistic/revolver/nagant
Expand Down
3 changes: 2 additions & 1 deletion code/modules/clothing/outfits/ert/minutemen_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
id_role = "Sargent"

/datum/outfit/centcom/ert/minutemen/gold_irs
name = "CMM GOLD Collector"
name = "ERT - CMM GOLD Collector"

head = null
mask = null
Expand All @@ -98,6 +98,7 @@
suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
ears = /obj/item/radio/headset/minutemen/alt/captain
back = /obj/item/storage/backpack/satchel/leather
id = /obj/item/card/id/silver

l_pocket = null
r_pocket = null
Expand Down
6 changes: 4 additions & 2 deletions code/modules/clothing/outfits/ert/nanotrasen_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/kitchen/knife/combat

backpack_contents = list(/obj/item/radio=1)

id_role = "Security Specialist"

/datum/outfit/centcom/ert/lp/medic
Expand All @@ -433,7 +435,7 @@
l_pocket = /obj/item/healthanalyzer
r_pocket = /obj/item/reagent_containers/hypospray/medipen/atropine

backpack_contents = list(/obj/item/storage/firstaid/medical=1)
backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)

id_role = "Medical Specialist"

Expand All @@ -455,7 +457,7 @@

id_role = "Engineering Specialist"

backpack_contents = list(/obj/item/stack/sheet/metal/fifty=1, /obj/item/stack/sheet/glass/fifty=1)
backpack_contents = list(/obj/item/stack/sheet/metal/fifty=1, /obj/item/stack/sheet/glass/fifty=1, /obj/item/radio=1)

/datum/outfit/centcom/ert/lp/lieutenant
name = "ERT - Loss Prevention Lieutenant"
Expand Down
40 changes: 33 additions & 7 deletions code/modules/clothing/outfits/ert/syndicate_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
name = "ERT - Syndicate Basic"

uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/armor/vest
suit = /obj/item/clothing/suit/armor/vest/syndie
suit_store = /obj/item/gun/ballistic/automatic/smg/c20r
shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/syndicate
id = /obj/item/card/id/syndicate_command/crew_id
mask = /obj/item/clothing/mask/gas/syndicate
head = /obj/item/clothing/head/helmet/swat
mask = /obj/item/clothing/mask/gas/sechailer/minutemen
head = /obj/item/clothing/head/helmet/operator
back = /obj/item/storage/backpack/fireproof
belt = /obj/item/storage/belt/military/c20r
r_pocket = /obj/item/kitchen/knife/combat
l_pocket = /obj/item/grenade/frag

implants = list(/obj/item/implant/weapons_auth)
backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol=1, /obj/item/ammo_box/magazine/m10mm=2, /obj/item/radio=1)
backpack_contents = list(/obj/item/radio=1)
box = /obj/item/storage/box/survival/syndie

id_role = "Squaddie"
Expand All @@ -26,23 +26,47 @@
head = /obj/item/clothing/head/HoS/beret/syndicate
ears = /obj/item/radio/headset/syndicate/captain

backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol=1, /obj/item/ammo_box/magazine/m10mm=2, /obj/item/radio=1)

id_role = "Sergeant"

/datum/outfit/centcom/ert/syndicate/gorlex
name = "ERT - Syndicate Gorlex Trooper"

head = /obj/item/clothing/head/helmet/operator
head = /obj/item/clothing/head/helmet/swat
uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/vest/syndie
suit = /obj/item/clothing/suit/armor/vest/bulletproof
belt = /obj/item/storage/belt/military/assault
back = /obj/item/storage/backpack/security
suit_store = /obj/item/gun/ballistic/automatic/smg/m90

backpack_contents = list(/obj/item/ammo_box/magazine/m556=4, /obj/item/radio=1)

id_role = "Trooper"

/datum/outfit/centcom/ert/syndicate/gorlex/pointman
name = "ERT - Syndicate Gorlex Pointman"

suit_store = /obj/item/gun/ballistic/shotgun/bulldog
belt = /obj/item/storage/belt/military/bulldog

/datum/outfit/centcom/ert/syndicate/gorlex/medic
name = "ERT - Syndicate Gorlex Medic"

head = /obj/item/clothing/head/beret/black
suit = /obj/item/clothing/suit/armor/vest/alt
belt = /obj/item/storage/belt/medical/webbing/paramedic
glasses = /obj/item/clothing/glasses/hud/health

backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol=1, /obj/item/ammo_box/magazine/m10mm=2, /obj/item/storage/firstaid/tactical=1, /obj/item/radio=1)

/datum/outfit/centcom/ert/syndicate/gorlex/leader
name = "ERT - Syndicate Gorlex Sergeant"

head = /obj/item/clothing/head/HoS/beret/syndicate
back = /obj/item/storage/backpack/satchel/sec
mask = /obj/item/clothing/mask/gas/sechailer
glasses = /obj/item/clothing/glasses/hud/security/night

id_role = "Sergeant"

Expand Down Expand Up @@ -88,7 +112,7 @@
r_pocket = /obj/item/pinpointer/crew
accessory = /obj/item/clothing/accessory/holster/marine

backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/autosurgeon/cmo=1, /obj/item/radio=1)
backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/radio=1)

id_role = "Medical Technician"

Expand All @@ -100,4 +124,6 @@
ears = /obj/item/radio/headset/syndicate/captain
r_pocket = /obj/item/megaphone/command

list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/autosurgeon/cmo=1, /obj/item/radio=1)

Check warning on line 127 in code/modules/clothing/outfits/ert/syndicate_ert.dm

View workflow job for this annotation

GitHub Actions / Run Linters

relatively pathed proc defined here

id_role = "Lead Medical Technician"

0 comments on commit d2e80e0

Please sign in to comment.