cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates TSF Marine Loadouts (#32139)

Browse Source 
* marine gear

* Update outfit_admin.dm

* Update pda.dmi
This commit is contained in:
CRUNCH
2026-07-02 00:24:16 +01:00
committed by GitHub
parent 514b053bdb
commit e694ab9ebf
4 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/outfit_admin.dm
+12 -17
View File
@@ -724,15 +724,13 @@
I.assignment = "Trans-Solar Federation Representative"
H.sec_hud_set_ID()
/datum/outfit/admin/solgov
name = "TSF Marine"
uniform = /obj/item/clothing/under/solgov
suit = /obj/item/clothing/suit/armor/bulletproof
suit = /obj/item/clothing/suit/armor/federation/marine
back = /obj/item/storage/backpack/ert/solgov
belt = /obj/item/storage/belt/military/assault/marines/full
head = /obj/item/clothing/head/soft/solgov/marines
glasses = /obj/item/clothing/glasses/night
belt = /obj/item/storage/belt/federation_webbing/marine
head = /obj/item/clothing/head/helmet/federation/marine
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/radio/headset/ert/alt/solgov
@@ -740,13 +738,13 @@
l_hand = /obj/item/gun/projectile/automatic/shotgun/bulldog
suit_store = /obj/item/gun/projectile/automatic/pistol/m1911
r_pocket = /obj/item/flashlight/seclite
pda = /obj/item/pda
pda = /obj/item/pda/heads/ert/tsf
box = /obj/item/storage/box/responseteam
backpack_contents = list(
/obj/item/clothing/head/soft/solgov/marines = 1,
/obj/item/clothing/shoes/magboots = 1,
/obj/item/whetstone = 1,
/obj/item/clothing/mask/gas/explorer/marines = 1,
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
/obj/item/storage/fancy/crayons/marine = 1,
/obj/item/storage/mre = 1
)
@@ -762,7 +760,6 @@
var/is_solgov_lieutenant = FALSE
/datum/outfit/admin/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
@@ -784,19 +781,19 @@
/datum/outfit/admin/solgov/lieutenant
name = "TSF Lieutenant"
uniform = /obj/item/clothing/under/solgov/command
head = /obj/item/clothing/head/beret/solgov
suit = /obj/item/clothing/suit/armor/federation/marine/officer
head = /obj/item/clothing/head/helmet/federation/marine/officer
back = /obj/item/storage/backpack/satchel
shoes = /obj/item/clothing/shoes/magboots/elite
l_ear = /obj/item/radio/headset/ert/alt/commander/solgov
l_hand = null
belt = /obj/item/melee/baton/loaded
belt = /obj/item/storage/belt/federation_webbing/marine_officer
suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
l_pocket = /obj/item/pinpointer/advpinpointer
backpack_contents = list(
/obj/item/clothing/head/beret/solgov = 1,
/obj/item/storage/box/handcuffs = 1,
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
/obj/item/clothing/mask/gas/explorer/marines = 1,
/obj/item/ammo_box/magazine/m50 = 3,
/obj/item/storage/mre = 1
)
is_solgov_lieutenant = TRUE
@@ -806,13 +803,13 @@
uniform = /obj/item/clothing/under/solgov/elite
suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov
head = null
glasses = /obj/item/clothing/glasses/night
mask = /obj/item/clothing/mask/gas/explorer/marines
belt = /obj/item/storage/belt/military/assault/marines/elite/full
belt = /obj/item/storage/belt/federation_webbing/marsoc
shoes = /obj/item/clothing/shoes/magboots/elite
l_hand = /obj/item/gun/projectile/automatic/ar
backpack_contents = list(
/obj/item/whetstone = 1,
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
/obj/item/storage/mre = 1
)
cybernetic_implants = list(
@@ -828,15 +825,13 @@
uniform = /obj/item/clothing/under/solgov/command/elite
suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov/command
head = null
belt = /obj/item/melee/baton/loaded
belt = /obj/item/storage/belt/federation_webbing/marsoc_officer
l_hand = null
suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
l_pocket = /obj/item/pinpointer/advpinpointer
l_ear = /obj/item/radio/headset/ert/alt/commander/solgov
backpack_contents = list(
/obj/item/storage/box/handcuffs = 1,
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
/obj/item/ammo_box/magazine/m50 = 3,
/obj/item/storage/mre = 1
)
is_solgov_lieutenant = TRUE
code/game/objects/items/weapons/storage/belt.dm
+35 -17
View File
@@ -383,6 +383,41 @@
/obj/item/kitchen/knife
)
/obj/item/storage/belt/federation_webbing/marine/populate_contents()
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/ammo_box/magazine/m45(src)
new /obj/item/ammo_box/magazine/m45(src)
new /obj/item/reagent_containers/hypospray/autoinjector/survival(src)
update_icon()
/obj/item/storage/belt/federation_webbing/marine_officer/populate_contents()
new /obj/item/melee/baton/loaded(src)
new /obj/item/ammo_box/magazine/m50(src)
new /obj/item/ammo_box/magazine/m50(src)
new /obj/item/ammo_box/magazine/m50(src)
new /obj/item/reagent_containers/hypospray/autoinjector/survival(src)
update_icon()
/obj/item/storage/belt/federation_webbing/marsoc/populate_contents()
new /obj/item/ammo_box/magazine/m556/arg(src)
new /obj/item/ammo_box/magazine/m556/arg(src)
new /obj/item/ammo_box/magazine/m556/arg(src)
new /obj/item/ammo_box/magazine/m45(src)
new /obj/item/ammo_box/magazine/m45(src)
new /obj/item/reagent_containers/hypospray/autoinjector/survival(src)
update_icon()
/obj/item/storage/belt/federation_webbing/marsoc_officer/populate_contents()
new /obj/item/melee/baton/loaded(src)
new /obj/item/ammo_box/magazine/m50(src)
new /obj/item/ammo_box/magazine/m50(src)
new /obj/item/ammo_box/magazine/m50(src)
new /obj/item/reagent_containers/hypospray/autoinjector/survival(src)
update_icon()
/obj/item/storage/belt/soulstone
name = "soul stone belt"
desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away."
@@ -514,23 +549,6 @@
return
return ..()
/obj/item/storage/belt/military/assault/marines/full/populate_contents()
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/ammo_box/magazine/m12g(src)
new /obj/item/ammo_box/magazine/m45(src)
new /obj/item/ammo_box/magazine/m45(src)
update_icon()
/obj/item/storage/belt/military/assault/marines/elite/full/populate_contents()
new /obj/item/ammo_box/magazine/m556/arg(src)
new /obj/item/ammo_box/magazine/m556/arg(src)
new /obj/item/ammo_box/magazine/m556/arg(src)
new /obj/item/ammo_box/magazine/m45(src)
new /obj/item/ammo_box/magazine/m45(src)
update_icon()
/obj/item/storage/belt/military/assault/soviet/full/populate_contents()
new /obj/item/ammo_box/magazine/ak814(src)
new /obj/item/ammo_box/magazine/ak814(src)
code/modules/pda/pdas.dm
+3
View File
@@ -125,6 +125,9 @@
/obj/item/pda/heads/ert/paranormal
icon_state = "pda-chaplain"
/obj/item/pda/heads/ert/tsf
icon_state = "pda-tsf"
/obj/item/pda/cargo
default_cartridge = /obj/item/cartridge/cargo
icon_state = "pda-cargo"