cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB Ignore] [IDB Ignore] Kills off /obj/item/device (#21774)

Browse Source 
This has zero reason to exist in our code base. We have no procs or
variables tied to this. I removed it to make future modifications
cleaner.

---------

Signed-off-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
This commit is contained in:
Cody Brittain
2026-02-01 05:14:26 +00:00
committed by GitHub
parent 75424095ac
commit 3f62424312
857 changed files with 8690 additions and 8599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/ert/ap_eridani.dm
+8 -8
View File
@@ -14,7 +14,7 @@
back = /obj/item/storage/backpack/satchel/sec
belt = /obj/item/storage/belt/military
id = /obj/item/card/id/distress/ap_eridani
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
l_pocket = /obj/item/grenade/chem_grenade/teargas
r_pocket = /obj/item/tank/emergency_oxygen/double
@@ -29,10 +29,10 @@
belt_contents = list(
/obj/item/ammo_magazine/c45m/auto = 3,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/melee/baton/stunrod = 1,
/obj/item/device/flashlight/maglight = 1,
/obj/item/flashlight/maglight = 1,
/obj/item/shield/riot/tact = 1,
/obj/item/grenade/flashbang = 1
)
@@ -74,7 +74,7 @@
belt_contents = list(
/obj/item/ammo_magazine/c45m/auto = 3,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/melee/baton/stunrod = 1,
/obj/item/grenade/flashbang = 1,
@@ -97,8 +97,8 @@
back = /obj/item/storage/backpack/satchel/med
accessory = /obj/item/clothing/accessory/holster/thigh
accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1)
r_ear = /obj/item/device/flashlight/pen
l_pocket = /obj/item/device/healthanalyzer
r_ear = /obj/item/flashlight/pen
l_pocket = /obj/item/healthanalyzer
r_pocket = /obj/item/melee/telebaton
l_hand = /obj/item/clothing/head/helmet/space/void/medical
r_hand = /obj/item/clothing/suit/space/void/medical
@@ -108,7 +108,7 @@
/obj/item/storage/box/survival = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/storage/firstaid/surgery = 1,
/obj/item/device/advanced_healthanalyzer = 1,
/obj/item/advanced_healthanalyzer = 1,
/obj/item/clothing/accessory/storage/pouches/black = 1,
/obj/item/reagent_containers/glass/bottle/thetamycin = 1,
/obj/item/surgery/scalpel/manager = 1,
@@ -141,7 +141,7 @@
belt = /obj/item/storage/belt/medical/paramedic/combat
accessory = /obj/item/clothing/accessory/holster/thigh
accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1)
l_pocket = /obj/item/device/healthanalyzer
l_pocket = /obj/item/healthanalyzer
r_pocket = /obj/item/crowbar
l_hand = /obj/item/storage/firstaid/adv
code/datums/outfits/ert/biesel.dm
+2 -2
View File
@@ -8,7 +8,7 @@
shoes = /obj/item/clothing/shoes/jackboots
id = /obj/item/card/id/distress/legion/tcaf
accessory = /obj/item/clothing/accessory/holster/hip
l_ear = /obj/item/device/radio/headset/legion
l_ear = /obj/item/radio/headset/legion
r_pocket = /obj/item/crowbar/red
l_pocket = /obj/item/tank/emergency_oxygen/double
back = /obj/item/storage/backpack/tcaf
@@ -84,7 +84,7 @@
/obj/item/storage/firstaid/combat = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/energy/sword/knife = 1,
code/datums/outfits/ert/coalition.dm
+5 -5
View File
@@ -3,7 +3,7 @@
uniform = /obj/item/clothing/under/tactical
shoes = /obj/item/clothing/shoes/magboots
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
l_pocket = /obj/item/tank/emergency_oxygen/double
r_pocket = /obj/item/crowbar/red
id = /obj/item/card/id/ert
@@ -38,7 +38,7 @@
/obj/item/ammo_magazine/c45m = 3,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/material/knife/tacknife = 1
@@ -99,7 +99,7 @@
back = /obj/item/tank/jetpack/carbondioxide
l_pocket = /obj/item/tank/emergency_oxygen/double
r_pocket = /obj/item/crowbar/red
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
gloves = /obj/item/clothing/gloves/swat/ert
mask = /obj/item/clothing/mask/gas/tactical
suit_store = /obj/item/gun/projectile/automatic/rifle/konyang/k556
@@ -122,7 +122,7 @@
/obj/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(H.isSynthetic())
H.equip_to_slot_or_del(new /obj/item/device/suit_cooling_unit(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/suit_cooling_unit(H), slot_back)
/obj/outfit/admin/ert/konyang/medic
name = "KASF Medic"
@@ -147,7 +147,7 @@
/obj/item/ammo_magazine/mc9mm = 2,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/energy/sword/knife/sol = 1
code/datums/outfits/ert/deathsquad.dm
+2 -2
View File
@@ -7,7 +7,7 @@
shoes = null
gloves = null
mask = /obj/item/clothing/mask/gas/swat
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical
id = /obj/item/card/id/asset_protection
l_pocket = /obj/item/plastique
@@ -31,7 +31,7 @@
name = "Asset Protection Lead"
l_pocket = /obj/item/pinpointer
r_hand = /obj/item/device/orbital_dropper/icarus_drones
r_hand = /obj/item/orbital_dropper/icarus_drones
/obj/outfit/admin/deathsquad/get_id_access()
return get_all_accesses()
code/datums/outfits/ert/dominia.dm
+2 -2
View File
@@ -11,7 +11,7 @@
l_pocket = /obj/item/crowbar/red
suit_accessory = /obj/item/clothing/accessory/dominia
id = /obj/item/card/id/imperial_fleet
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
mask = /obj/item/clothing/mask/gas
accessory = /obj/item/clothing/accessory/holster/hip
accessory_contents = list(
@@ -50,7 +50,7 @@
/obj/item/ammo_magazine/c45m/dominia = 1,
/obj/item/ammo_magazine/submachinemag = 2,
/obj/item/storage/firstaid/adv = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/material/knife/bayonet= 1,
code/datums/outfits/ert/einstein.dm
+3 -3
View File
@@ -6,7 +6,7 @@
head = /obj/item/clothing/head/helmet/space/void/einstein
back = /obj/item/tank/jetpack/carbondioxide
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
id = /obj/item/card/id/zeng_hu
mask = /obj/item/clothing/mask/gas/tactical
glasses = /obj/item/clothing/glasses/night
@@ -19,7 +19,7 @@
)
belt_contents = list(
/obj/item/shield/energy = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 2,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/flashbang = 2,
@@ -41,7 +41,7 @@
/obj/item/ammo_magazine/c45m = 2,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/baton/loaded = 1,
code/datums/outfits/ert/elyra.dm
+3 -3
View File
@@ -4,7 +4,7 @@
uniform = /obj/item/clothing/under/rank/elyran_fatigues
shoes = /obj/item/clothing/shoes/magboots
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
l_pocket = /obj/item/tank/emergency_oxygen/double
r_pocket = /obj/item/crowbar/red
id = /obj/item/card/id/ert
@@ -75,7 +75,7 @@
/obj/item/ammo_magazine/c45m = 3,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/energy/sword = 1
@@ -114,4 +114,4 @@
l_hand = /obj/item/gun/projectile/plasma
accessory = /obj/item/clothing/accessory/storage/black_vest
accessory_contents = list(/obj/item/device/flash = 1, /obj/item/handcuffs = 2, /obj/item/gun/projectile/pistol = 1)
accessory_contents = list(/obj/item/flash = 1, /obj/item/handcuffs = 2, /obj/item/gun/projectile/pistol = 1)
code/datums/outfits/ert/fsf.dm
+4 -4
View File
@@ -12,7 +12,7 @@
id = /obj/item/card/id/distress/fsf
l_pocket = /obj/item/tank/emergency_oxygen/double
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
backpack_contents = list(
/obj/item/melee/energy/sword/knife/sol = 1
@@ -48,7 +48,7 @@
/obj/item/storage/box/shells/buckshot = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/energy/sword/knife/sol = 1
@@ -121,10 +121,10 @@
l_pocket = null
belt_contents = null
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
backpack_contents = list(
/obj/item/melee/energy/sword/knife/sol = 1,
/obj/item/grenade/smokebomb = 2,
/obj/item/device/binoculars = 1
/obj/item/binoculars = 1
)
code/datums/outfits/ert/hephaestus_ert.dm
+2 -2
View File
@@ -9,7 +9,7 @@
suit = /obj/item/clothing/suit/space/void/hephaestus
head = /obj/item/clothing/head/helmet/space/void/hephaestus
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
id = /obj/item/card/id/hephaestus
mask = /obj/item/clothing/mask/gas/tactical
glasses = /obj/item/clothing/glasses/night
@@ -57,7 +57,7 @@
/obj/item/ammo_magazine/c45m = 3,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/baton/loaded = 1,
code/datums/outfits/ert/iac.dm
+6 -6
View File
@@ -14,7 +14,7 @@
id = /obj/item/card/id/distress/iac
accessory_contents = list(/obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/reagent_containers/glass/bottle/mortaphenyl = 1)
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
backpack_contents = list(
/obj/item/storage/box/survival = 1,
@@ -22,8 +22,8 @@
/obj/item/storage/firstaid/surgery = 1,
/obj/item/storage/box/gloves = 1,
/obj/item/storage/box/syringes = 1,
/obj/item/device/flashlight/pen = 1,
/obj/item/device/healthanalyzer = 1
/obj/item/flashlight/pen = 1,
/obj/item/healthanalyzer = 1
)
belt_contents = list(
@@ -79,10 +79,10 @@
belt_contents = list(
/obj/item/ammo_magazine/c45m/auto = 3,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 2,
/obj/item/melee/baton/loaded = 1,
/obj/item/device/flashlight/flare = 1
/obj/item/flashlight/flare = 1
)
/obj/outfit/admin/ert/iac/paramedic
@@ -95,7 +95,7 @@
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/storage/firstaid/adv = 2,
/obj/item/storage/firstaid/o2 = 1,
/obj/item/storage/box/syringes = 1,
code/datums/outfits/ert/izweski.dm
+2 -2
View File
@@ -10,7 +10,7 @@
accessory_contents = list(/obj/item/gun/energy/pistol/hegemony = 1)
gloves = /obj/item/clothing/gloves/black/unathi
back = /obj/item/recharger_backpack/high
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
l_pocket = /obj/item/tank/emergency_oxygen/double
belt_contents = list(
/obj/item/melee/energy/sword/hegemony = 1,
@@ -48,7 +48,7 @@
/obj/item/shield/energy/hegemony = 1,
/obj/item/crowbar = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/handcuffs/ziptie = 2
)
gloves = /obj/item/clothing/gloves/latex/nitrile/unathi
code/datums/outfits/ert/kataphract.dm
+3 -3
View File
@@ -13,10 +13,10 @@
id = /obj/item/card/id/distress/kataphract
back = /obj/item/storage/backpack/satchel/hegemony
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
l_hand = /obj/item/martial_manual/swordsmanship
r_pocket = /obj/item/device/radio
r_pocket = /obj/item/radio
belt_contents = null
@@ -102,7 +102,7 @@
/obj/item/storage/box/unique/donkpockets = 1,
/obj/item/crowbar = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/reagent_containers/glass/bottle/thetamycin = 1,
/obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1
)
code/datums/outfits/ert/kosmostrelki.dm
+7 -7
View File
@@ -5,7 +5,7 @@
shoes = /obj/item/clothing/shoes/magboots
gloves = /obj/item/clothing/gloves/black/tajara
uniform = /obj/item/clothing/under/tajaran/cosmonaut
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
head = /obj/item/clothing/head/helmet/space/void/pra
suit = /obj/item/clothing/suit/space/void/pra
suit_store = /obj/item/tank/oxygen/red
@@ -41,7 +41,7 @@
back = /obj/item/storage/backpack/satchel/leather
backpack_contents = list(
/obj/item/device/versebook/pra = 1,
/obj/item/versebook/pra = 1,
/obj/item/storage/box/hadii_card = 1,
/obj/item/gun/projectile/deagle/adhomai = 1,
/obj/item/clothing/accessory/holster/hip/brown = 1,
@@ -49,7 +49,7 @@
/obj/item/clothing/head/tajaran/cosmonaut_commissar = 1
)
l_pocket = /obj/item/device/megaphone
l_pocket = /obj/item/megaphone
accessory = /obj/item/clothing/accessory/hadii_pin
l_hand = /obj/item/martial_manual/tajara
@@ -70,10 +70,10 @@
backpack_contents = list(
/obj/item/gun/projectile/automatic/tommygun = 1,
/obj/item/clothing/accessory/holster/hip/brown = 1,
/obj/item/device/binoculars = 1,
/obj/item/binoculars = 1,
/obj/item/ammo_magazine/submachinedrum = 1)
l_pocket = /obj/item/device/megaphone
l_pocket = /obj/item/megaphone
l_hand = /obj/item/martial_manual/tajara
/obj/outfit/admin/ert/pra_cosmonaut/tesla
@@ -117,7 +117,7 @@
/obj/item/ammo_magazine/c45uzi = 2,
/obj/item/storage/firstaid/combat = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/device/flashlight/pen = 1,
/obj/item/flashlight/pen = 1,
/obj/item/gun/projectile/pistol/adhomai = 1
)
@@ -129,7 +129,7 @@
/obj/item/reagent_containers/glass/bottle/dexalin_plus = 1,
/obj/item/reagent_containers/glass/bottle/bicaridine = 1,
/obj/item/reagent_containers/glass/bottle/dermaline = 1,
/obj/item/device/healthanalyzer = 1
/obj/item/healthanalyzer = 1
)
l_hand = /obj/item/martial_manual/tajara
code/datums/outfits/ert/mercenary.dm
+3 -3
View File
@@ -14,7 +14,7 @@
glasses = /obj/item/clothing/glasses/sunglasses/aviator
l_pocket = /obj/item/tank/emergency_oxygen/double
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
backpack_contents = list(
/obj/item/storage/box/survival = 1,
@@ -51,7 +51,7 @@
/obj/item/ammo_magazine/c45m = 1,
/obj/item/storage/firstaid/combat = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1
)
@@ -94,7 +94,7 @@
/obj/item/ammo_magazine/c45m = 2,
/obj/item/handcuffs/ziptie = 1,
/obj/item/shield/energy = 1,
/obj/item/device/flashlight/flare = 1,
/obj/item/flashlight/flare = 1,
)
/obj/outfit/admin/ert/mercenary/leader
code/datums/outfits/ert/nt_ert.dm
+1 -1
View File
@@ -11,7 +11,7 @@
id = /obj/item/card/id/ert
back = /obj/item/rig/ert/security
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
belt_contents = list(
/obj/item/handcuffs = 2,
code/datums/outfits/ert/qukala.dm
+3 -3
View File
@@ -8,7 +8,7 @@
head = /obj/item/clothing/head/helmet/space/void/kala
back = /obj/item/storage/backpack/kala
suit_store = /obj/item/gun/energy/gun/qukala
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
l_pocket = /obj/item/tank/emergency_oxygen/double
id = /obj/item/card/id
backpack_contents = list(
@@ -53,7 +53,7 @@
B.replaced(H, affectedB)
H.update_body()
if(H.is_diona())
H.equip_or_collect(new /obj/item/device/uv_light(src), slot_in_backpack)
H.equip_or_collect(new /obj/item/uv_light(src), slot_in_backpack)
if(H?.shoes)
var/obj/item/clothing/shoes/magboots/advance/boots = new(H)
H.equip_to_slot_if_possible(boots, slot_shoes)
@@ -94,7 +94,7 @@
/obj/item/storage/firstaid/combat = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/telebaton/nlom = 1,
code/datums/outfits/ert/scc_ert.dm
+1 -1
View File
@@ -8,7 +8,7 @@
id = /obj/item/card/id/ert/scc
back = /obj/item/rig/ert/scc/security
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
belt_contents = list(
/obj/item/handcuffs = 2,
code/datums/outfits/ert/syndicate.dm
+1 -1
View File
@@ -4,7 +4,7 @@
uniform = /obj/item/clothing/under/syndicate
belt = /obj/item/storage/belt/military/syndicate
mask = /obj/item/clothing/mask/gas/syndicate
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
glasses = /obj/item/clothing/glasses/thermal
id = /obj/item/card/id/syndicate/ert
l_pocket = /obj/item/ammo_magazine/c45m
code/datums/outfits/ert/tcfl.dm
+2 -2
View File
@@ -3,7 +3,7 @@
head = /obj/item/clothing/head/beret/legion/field
uniform = /obj/item/clothing/under/legion
l_ear = /obj/item/device/radio/headset/legion
l_ear = /obj/item/radio/headset/legion
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/swat/ert
glasses = /obj/item/clothing/glasses/sunglasses/aviator
@@ -47,7 +47,7 @@
back = null
belt = /obj/item/storage/belt/security/tactical
accessory = /obj/item/clothing/accessory/storage/webbingharness/pouches/ert
accessory_contents = list(/obj/item/gun/energy/blaster/pilot_special = 1, /obj/item/device/binoculars = 1)
accessory_contents = list(/obj/item/gun/energy/blaster/pilot_special = 1, /obj/item/binoculars = 1)
backpack_contents = null
code/datums/outfits/ert/vaurca.dm
+4 -4
View File
@@ -8,7 +8,7 @@
mask = /obj/item/clothing/mask/gas/vaurca/tactical
glasses = /obj/item/clothing/glasses/sunglasses/blinders
id = /obj/item/card/id
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
accessory = /obj/item/clothing/accessory/holster/hip
accessory_contents = list(
/obj/item/gun/energy/vaurca/blaster = 1
@@ -61,7 +61,7 @@
/obj/item/storage/firstaid/combat = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/energy/vaurca = 1,
@@ -151,7 +151,7 @@
mask = /obj/item/clothing/mask/gas/vaurca/tactical
glasses = /obj/item/clothing/glasses/sunglasses/blinders
id = /obj/item/card/id
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
r_pocket = /obj/item/crowbar/red
accessory = /obj/item/clothing/accessory/holster/hip
r_hand = /obj/item/recharger_backpack/high //so they can charge the hegemony weapons
@@ -206,7 +206,7 @@
/obj/item/storage/firstaid/combat = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/energy/sword/hegemony = 1,
code/datums/outfits/ert/zavod.dm
+2 -2
View File
@@ -6,7 +6,7 @@
suit = /obj/item/clothing/suit/space/void/zavodskoi
head = /obj/item/clothing/head/helmet/space/void/zavodskoi
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
id = /obj/item/card/id/zavodskoi
mask = /obj/item/clothing/mask/gas/tactical
glasses = /obj/item/clothing/glasses/safety/goggles/goon/zavod
@@ -46,7 +46,7 @@
/obj/item/ammo_magazine/mc9mm = 2,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/baton/loaded = 1,
code/datums/outfits/ert/zenghu.dm
+3 -3
View File
@@ -6,7 +6,7 @@
suit = /obj/item/clothing/suit/space/void/zenghu
head = /obj/item/clothing/head/helmet/space/void/zenghu
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/distress
l_ear = /obj/item/radio/headset/distress
id = /obj/item/card/id/zeng_hu
mask = /obj/item/clothing/mask/gas/tactical
glasses = /obj/item/clothing/glasses/night
@@ -19,7 +19,7 @@
)
belt_contents = list(
/obj/item/shield/energy = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 2,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/flashbang = 2
@@ -39,7 +39,7 @@
/obj/item/storage/firstaid/combat = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/melee/baton/loaded = 1,
code/datums/outfits/event/outfit_events.dm
+6 -6
View File
@@ -5,7 +5,7 @@
back = /obj/item/gun/energy/rifle/pulse
gloves = /obj/item/clothing/gloves/force/basic
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
head = /obj/item/clothing/head/helmet/space/void/lancer
species_head = list(
@@ -28,7 +28,7 @@
/obj/item/grenade/frag = 1,
/obj/item/melee/energy/sword = 1,
/obj/item/shield/energy = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 2,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/empgrenade = 1
@@ -61,7 +61,7 @@
accessory_contents = list(
/obj/item/plastique = 3,
/obj/item/grenade/frag = 1,
/obj/item/device/flash = 1
/obj/item/flash = 1
)
id_access = "Lance Engineer"
@@ -82,7 +82,7 @@
accessory = /obj/item/clothing/accessory/holster/thigh
accessory_contents = list(/obj/item/gun/energy/pulse/pistol = 1)
belt_contents = list(
/obj/item/device/healthanalyzer = 1,
/obj/item/healthanalyzer = 1,
/obj/item/reagent_containers/hypospray/combat = 1,
/obj/item/reagent_containers/syringe = 1,
/obj/item/personal_inhaler/combat = 1,
@@ -103,7 +103,7 @@
accessory_contents = list(/obj/item/gun/energy/pulse/pistol = 1)
backpack_contents = list(
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/clothing/gloves/yellow = 1
)
id_access = "Lance Operative"
@@ -117,7 +117,7 @@
uniform = /obj/item/clothing/under/rank/sol
shoes = /obj/item/clothing/shoes/magboots
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
glasses = /obj/item/clothing/glasses/thermal
l_pocket = /obj/item/tank/emergency_oxygen/double
r_pocket = /obj/item/crowbar/red
code/datums/outfits/event/outfit_generic/mercenary.dm
+1 -1
View File
@@ -52,7 +52,7 @@
/obj/item/storage/belt/military,
)
belt_contents = list(
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/material/knife/tacknife = 1,
/obj/item/gun/projectile/pistol = 1,
code/datums/outfits/event/outfit_generic/mining.dm
+1 -1
View File
@@ -29,7 +29,7 @@
)
belt_contents = list(
/obj/item/gun/custom_ka/frame01/prebuilt=1,
/obj/item/device/flashlight/lantern=1,
/obj/item/flashlight/lantern=1,
)
head = list(
/obj/item/clothing/head/hardhat,
code/datums/outfits/event/outfit_killers.dm
+2 -2
View File
@@ -7,7 +7,7 @@
gloves = /obj/item/clothing/gloves/latex
mask = /obj/item/clothing/mask/surgical
head = /obj/item/clothing/head/welding
l_ear = /obj/item/device/radio/headset
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/plain/monocle
l_pocket = /obj/item/material/knife
r_pocket = /obj/item/surgery/scalpel
@@ -27,7 +27,7 @@
suit = /obj/item/clothing/suit/wcoat
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/black
l_ear = /obj/item/device/radio/headset
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/sunglasses
l_pocket = /obj/item/melee/energy/sword
r_pocket = /obj/item/cloaking_device
code/datums/outfits/event/outfit_megacorps.dm
+7 -7
View File
@@ -6,7 +6,7 @@
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/magboots
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
suit_store = /obj/item/gun/energy/laser
suit = /obj/item/clothing/suit/space/void/hephaestus
head = /obj/item/clothing/head/helmet/space/void/hephaestus
@@ -21,7 +21,7 @@
belt_contents = list(
/obj/item/shield/energy = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 2,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/flashbang = 2
@@ -49,7 +49,7 @@
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/magboots
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
suit_store = /obj/item/gun/energy/laser
suit = /obj/item/clothing/suit/space/void/zenghu
head = /obj/item/clothing/head/helmet/space/void/zenghu
@@ -64,7 +64,7 @@
belt_contents = list(
/obj/item/shield/energy = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 2,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/flashbang = 2
@@ -87,7 +87,7 @@
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/magboots
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
suit_store = /obj/item/gun/projectile/automatic/wt550
suit = /obj/item/clothing/suit/space/void/zavodskoi
head = /obj/item/clothing/head/helmet/space/void/zavodskoi
@@ -102,7 +102,7 @@
belt_contents = list(
/obj/item/shield/energy = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 2,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/flashbang = 2
@@ -139,7 +139,7 @@
shoes = null
gloves = null
mask = /obj/item/clothing/mask/gas/swat
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical
id = /obj/item/card/id/syndicate
l_pocket = /obj/item/plastique
code/datums/outfits/event/outfit_nanotrasen.dm
+31 -31
View File
@@ -5,7 +5,7 @@
back = /obj/item/storage/backpack/satchel/leather
gloves = /obj/item/clothing/gloves/white
shoes = /obj/item/clothing/shoes/laceup
l_ear = /obj/item/device/radio/headset/ert/ccia
l_ear = /obj/item/radio/headset/ert/ccia
glasses = /obj/item/clothing/glasses/sunglasses
id = /obj/item/card/id
@@ -23,17 +23,17 @@
name = "NanoTrasen Navy Officer"
uniform = /obj/item/clothing/under/rank/centcom_officer
l_ear = /obj/item/device/radio/headset/heads/captain
l_ear = /obj/item/radio/headset/heads/captain
head = /obj/item/clothing/head/beret/centcom/officer
l_pocket = /obj/item/device/orbital_dropper/icarus_drones
l_pocket = /obj/item/orbital_dropper/icarus_drones
/obj/outfit/admin/nt/captain
name = "NanoTrasen Navy Captain"
uniform = /obj/item/clothing/under/rank/centcom_captain
l_ear = /obj/item/device/radio/headset/heads/captain
l_ear = /obj/item/radio/headset/heads/captain
head = /obj/item/clothing/head/beret/centcom/captain
l_pocket = /obj/item/device/orbital_dropper/icarus_drones
l_pocket = /obj/item/orbital_dropper/icarus_drones
/obj/outfit/admin/nt/protection_detail
name = "ERT Protection Detail"
@@ -42,7 +42,7 @@
suit = /obj/item/clothing/suit/storage/vest/heavy/ert/peacekeeper
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/swat/tactical
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
glasses = /obj/item/clothing/glasses/sunglasses/sechud
id = /obj/item/card/id/ccia
head = /obj/item/clothing/head/beret/centcom/civilprotection
@@ -71,8 +71,8 @@
var/obj/item/shield/riot/tact/shield = new(H)
var/obj/item/grenade/flashbang/flashbang = new(H)
var/obj/item/handcuffs/cuffs = new(H)
var/obj/item/device/flash/flash = new(H)
var/obj/item/device/flashlight/flare/flare = new(H)
var/obj/item/flash/flash = new(H)
var/obj/item/flashlight/flare/flare = new(H)
H.belt.contents += flare
H.belt.contents += flashbang
@@ -90,14 +90,14 @@
suit = /obj/item/clothing/suit/storage/vest/heavy/ert/commander
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/white
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
glasses = /obj/item/clothing/glasses/sunglasses/sechud
head = /obj/item/clothing/head/beret/centcom/commander
backpack_contents = list(
/obj/item/storage/box/fancy/cigarettes/cigar = 1,
/obj/item/flame/lighter/zippo = 1,
/obj/item/device/orbital_dropper/icarus_drones = 1
/obj/item/orbital_dropper/icarus_drones = 1
)
implants = list(
@@ -112,17 +112,17 @@
uniform = /obj/item/clothing/under/rank/centcom_officer
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/white
l_ear = /obj/item/device/radio/headset/ert/ccia
l_ear = /obj/item/radio/headset/ert/ccia
glasses = /obj/item/clothing/glasses/sunglasses/sechud
head = /obj/item/clothing/head/beret/centcom/officer
l_pocket = /obj/item/reagent_containers/spray/pepper
r_pocket = /obj/item/device/taperecorder/cciaa
r_pocket = /obj/item/taperecorder/cciaa
l_hand = /obj/item/storage/lockbox/cciaa
pda = /obj/item/modular_computer/handheld/pda/command/cciaa
id = /obj/item/card/id/ccia
backpack_contents = list(
/obj/item/device/memorywiper = 1
/obj/item/memorywiper = 1
)
id_icon = "ccia"
@@ -134,7 +134,7 @@
uniform = /obj/item/clothing/under/suit_jacket/nt_skirtsuit
shoes = /obj/item/clothing/shoes/flats
wrist = /obj/item/clothing/wrists/watch/gold
l_ear = /obj/item/device/radio/headset/ert/ccia
l_ear = /obj/item/radio/headset/ert/ccia
id = /obj/item/card/id/ccia
l_pocket = /obj/item/reagent_containers/spray/pepper
@@ -145,7 +145,7 @@
suit = /obj/item/clothing/suit/storage/vest/heavy/ert/peacekeeper
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/swat/tactical
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical
mask = /obj/item/clothing/mask/gas/tactical
head = /obj/item/clothing/head/helmet/swat/peacekeeper
@@ -161,7 +161,7 @@
/obj/item/reagent_containers/spray/pepper = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/chem_grenade/gas = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/ammo_magazine/c45m/auto = 2
)
@@ -189,7 +189,7 @@
suit = /obj/item/clothing/suit/armor/swat/officer
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
glasses = /obj/item/clothing/glasses/eyepatch/hud/thermal
mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana
head = /obj/item/clothing/head/helmet/space/deathsquad/beret
@@ -210,7 +210,7 @@
gloves = /obj/item/clothing/gloves/black
l_pocket = /obj/item/reagent_containers/spray/pepper
r_pocket = /obj/item/device/taperecorder/cciaa
r_pocket = /obj/item/taperecorder/cciaa
l_hand = /obj/item/storage/lockbox/cciaa/bssb
id = /obj/item/card/id/ccia/bssb
@@ -219,7 +219,7 @@
backpack_contents = list(
/obj/item/storage/box/survival/engineer = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs = 1
)
@@ -248,7 +248,7 @@
r_pocket = null
l_hand = null
belt_contents = list(
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/handcuffs = 2,
/obj/item/ammo_magazine/c45m = 2
@@ -276,8 +276,8 @@
shoes = /obj/item/clothing/shoes/sneakers/black
mask = /obj/item/clothing/mask/surgical
l_hand = /obj/item/storage/firstaid/adv
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt
headset = /obj/item/radio/headset/headset_med
bowman = /obj/item/radio/headset/headset_med/alt
glasses = /obj/item/clothing/glasses/hud/health
gloves = /obj/item/clothing/gloves/white
@@ -292,7 +292,7 @@
/obj/item/storage/firstaid/surgery = 1,
/obj/item/storage/box/gloves = 1,
/obj/item/storage/box/syringes = 1,
/obj/item/device/flashlight/pen = 1
/obj/item/flashlight/pen = 1
)
belt_contents = list(
@@ -313,8 +313,8 @@
uniform = /obj/item/clothing/under/rank/medical/pharmacist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/nt
shoes = /obj/item/clothing/shoes/sneakers/medsci
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt
headset = /obj/item/radio/headset/headset_med
bowman = /obj/item/radio/headset/headset_med/alt
glasses = /obj/item/clothing/glasses/hud/health
backpack = /obj/item/storage/backpack/pharmacy
@@ -329,8 +329,8 @@
uniform = /obj/item/clothing/under/rank/bartender
shoes = /obj/item/clothing/shoes/laceup
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
headset = /obj/item/radio/headset/headset_service
bowman = /obj/item/radio/headset/headset_service/alt
id_access = "Service"
@@ -341,8 +341,8 @@
suit = /obj/item/clothing/suit/chef_jacket
head = /obj/item/clothing/head/chefhat
shoes = /obj/item/clothing/shoes/laceup
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
headset = /obj/item/radio/headset/headset_service
bowman = /obj/item/radio/headset/headset_service/alt
id_access = "Service"
@@ -352,8 +352,8 @@
uniform = /obj/item/clothing/under/rank/janitor
pda = /obj/item/modular_computer/handheld/pda/civilian
shoes = /obj/item/clothing/shoes/galoshes
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
headset = /obj/item/radio/headset/headset_service
bowman = /obj/item/radio/headset/headset_service/alt
l_pocket = /obj/item/grenade/chem_grenade/cleaner
r_pocket = /obj/item/grenade/chem_grenade/cleaner
code/datums/outfits/event/outfit_scc.dm
+5 -5
View File
@@ -4,12 +4,12 @@
uniform = /obj/item/clothing/under/rank/scc
back = /obj/item/storage/backpack/satchel/leather
shoes = /obj/item/clothing/shoes/laceup
l_ear = /obj/item/device/radio/headset/ert/ccia
l_ear = /obj/item/radio/headset/ert/ccia
glasses = /obj/item/clothing/glasses/sunglasses
wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/command
l_pocket = /obj/item/reagent_containers/spray/pepper
r_pocket = /obj/item/device/taperecorder/cciaa
r_pocket = /obj/item/taperecorder/cciaa
id = /obj/item/card/id
@@ -36,12 +36,12 @@
head = /obj/item/clothing/head/helmet/merc/scc
uniform = /obj/item/clothing/under/tactical
suit = /obj/item/clothing/suit/armor/carrier/heavy/scc
l_ear = /obj/item/device/radio/headset/ert/ccia/alt
l_ear = /obj/item/radio/headset/ert/ccia/alt
shoes = /obj/item/clothing/shoes/jackboots
wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/security
l_pocket = /obj/item/shield/energy
r_pocket = /obj/item/device/radio
r_pocket = /obj/item/radio
accessory = /obj/item/clothing/accessory/holster/armpit
accessory_contents = list(/obj/item/gun/energy/repeater)
@@ -51,7 +51,7 @@
/obj/item/reagent_containers/spray/pepper = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/chem_grenade/gas = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 2
)
code/datums/outfits/event/outfit_siib.dm
+4 -4
View File
@@ -5,7 +5,7 @@
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/black
glasses = /obj/item/clothing/glasses/sunglasses/sechud
l_ear = /obj/item/device/radio/headset/ert/siib
l_ear = /obj/item/radio/headset/ert/siib
back = /obj/item/storage/backpack/satchel/leather
r_pocket = /obj/item/ammo_magazine/mc9mm
@@ -14,7 +14,7 @@
backpack_contents = list(
/obj/item/storage/box/survival/engineer = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/handcuffs/ziptie = 2
)
id = null
@@ -30,7 +30,7 @@
suit_store = /obj/item/gun/projectile/automatic/c20r/sol/siib
mask = /obj/item/clothing/mask/balaclava
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/ert/siib
l_ear = /obj/item/radio/headset/ert/siib
head = /obj/item/clothing/head/helmet/merc
back = /obj/item/storage/backpack/satchel/leather
r_pocket = /obj/item/ammo_magazine/mc9mm
@@ -46,7 +46,7 @@
backpack_contents = list(
/obj/item/storage/box/survival/engineer = 1,
/obj/item/device/flash = 1,
/obj/item/flash = 1,
/obj/item/crowbar/red = 1,
/obj/item/handcuffs/ziptie = 2
)
code/datums/outfits/event/outfit_tfcl.dm
+1 -1
View File
@@ -5,7 +5,7 @@
suit = /obj/item/clothing/suit/storage/vest/legion/legate
gloves = /obj/item/clothing/gloves/swat/tactical
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/device/radio/headset/legion
l_ear = /obj/item/radio/headset/legion
head = /obj/item/clothing/head/legion/legate
glasses = /obj/item/clothing/glasses/sunglasses/aviator
id = /obj/item/card/id/distress/legion
code/datums/outfits/outfit.dm
+6 -6
View File
@@ -84,11 +84,11 @@
var/wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian
var/allow_headset_choice = FALSE
var/headset = /obj/item/device/radio/headset
var/bowman = /obj/item/device/radio/headset/alt
var/double_headset = /obj/item/device/radio/headset/alt/double
var/wrist_radio = /obj/item/device/radio/headset/wrist
var/clipon_radio = /obj/item/device/radio/headset/wrist/clip
var/headset = /obj/item/radio/headset
var/bowman = /obj/item/radio/headset/alt
var/double_headset = /obj/item/radio/headset/alt/double
var/wrist_radio = /obj/item/radio/headset/wrist
var/clipon_radio = /obj/item/radio/headset/wrist/clip
/// When spawning in, the ID will be set to this iff, preventing friendly fire.
var/id_iff = IFF_DEFAULT
@@ -325,7 +325,7 @@
else if (wrist)
equip_item(H, wrist, slot_wrists, callback = radio_callback)
/obj/outfit/proc/turn_into_thinset(var/obj/item/device/radio/headset/wrist/radio)
/obj/outfit/proc/turn_into_thinset(var/obj/item/radio/headset/wrist/radio)
if(istype(radio))
radio.icon_state = replacetext(radio.icon_state, "wrist", "thin")
radio.item_state = replacetext(radio.item_state, "wrist", "thin")
code/datums/outfits/outfit_admin.dm
+2 -2
View File
@@ -57,8 +57,8 @@
uniform = "suit selection"
shoes = "shoe selection"
l_ear = list(
/obj/item/device/radio/headset,
/obj/item/device/radio/headset/alt,
/obj/item/radio/headset,
/obj/item/radio/headset/alt,
)
back = list(
/obj/item/storage/backpack,
code/datums/outfits/outfit_antag.dm
+30 -30
View File
@@ -14,15 +14,15 @@
belt = /obj/item/storage/belt/utility/full
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/device/radio/headset/syndicate/alt
l_ear = /obj/item/radio/headset/syndicate/alt
id = /obj/item/card/id/syndicate
r_pocket = /obj/item/device/radio/uplink
r_pocket = /obj/item/radio/uplink
backpack_contents = list(
/obj/item/storage/box/survival/engineer = 1,
/obj/item/device/flashlight = 1,
/obj/item/flashlight = 1,
/obj/item/card/emag = 1,
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 1,
/obj/item/device/multitool = 1
/obj/item/multitool = 1
)
id_iff = IFF_SYNDICATE
@@ -35,7 +35,7 @@
if(visualsOnly)
return
var/obj/item/device/radio/uplink/U = H.r_store
var/obj/item/radio/uplink/U = H.r_store
if(istype(U))
U.hidden_uplink.uplink_owner = H.mind
U.hidden_uplink.telecrystals = uplink_uses
@@ -57,7 +57,7 @@
belt = /obj/item/storage/belt/military/syndicate
head = /obj/item/clothing/head/helmet/space/void/merc
mask = /obj/item/clothing/mask/gas/syndicate
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
glasses = /obj/item/clothing/glasses/night
shoes = /obj/item/clothing/shoes/magboots/syndie
l_pocket = /obj/item/pinpointer/nukeop
@@ -71,7 +71,7 @@
/obj/item/crowbar/red = 1,
/obj/item/plastique = 1,
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 1,
/obj/item/device/flashlight = 1,
/obj/item/flashlight = 1,
/obj/item/clothing/shoes/combat = 1
)
@@ -81,13 +81,13 @@
head = /obj/item/clothing/head/beret/red
mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana
belt = /obj/item/gun/projectile/deagle
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
l_pocket = /obj/item/pinpointer/advpinpointer
r_pocket = null // stop them getting a radio uplink, they get an implant instead
backpack_contents = list(
/obj/item/storage/box/survival/engineer = 1,
/obj/item/device/flashlight = 1,
/obj/item/flashlight = 1,
/obj/item/reagent_containers/pill/cyanide = 1,
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 1,
/obj/item/ammo_magazine/a50 = 2,
@@ -123,7 +123,7 @@
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/ring/ninja
mask = /obj/item/clothing/mask/balaclava
l_ear = /obj/item/device/radio/headset/ninja
l_ear = /obj/item/radio/headset/ninja
glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical
id = /obj/item/card/id/syndicate
l_pocket = null
@@ -133,10 +133,10 @@
backpack_contents = list()
belt_contents = list(
/obj/item/device/flashlight/maglight = 1,
/obj/item/flashlight/maglight = 1,
/obj/item/crowbar = 1,
/obj/item/screwdriver = 1,
/obj/item/device/paicard = 1
/obj/item/paicard = 1
)
id_access = "Syndicate Agent"
@@ -146,7 +146,7 @@
if(visualsOnly)
return
H.equip_to_slot_or_del(new /obj/item/device/special_uplink/ninja(H, H.mind), slot_l_store)
H.equip_to_slot_or_del(new /obj/item/special_uplink/ninja(H, H.mind), slot_l_store)
/obj/outfit/admin/syndicate/mercenary
name = "Mercenary"
@@ -156,7 +156,7 @@
gloves = /obj/item/clothing/gloves/swat
shoes = /obj/item/clothing/shoes/jackboots
pda = /obj/item/modular_computer/handheld/pda/syndicate
r_pocket = /obj/item/device/special_uplink/mercenary
r_pocket = /obj/item/special_uplink/mercenary
backpack_contents = list(
/obj/item/storage/box/survival/engineer = 1,
@@ -176,13 +176,13 @@
/obj/outfit/admin/syndicate/mercenary/loner
name = "Loner"
l_ear = /obj/item/device/radio/headset/syndicate
r_pocket = /obj/item/device/special_uplink/burglar
l_ear = /obj/item/radio/headset/syndicate
r_pocket = /obj/item/special_uplink/burglar
backpack_contents = list(
/obj/item/storage/box/syndie_kit/space = 1,
/obj/item/gun/projectile/shotgun/foldable = 1,
/obj/item/device/multitool/hacktool = 1
/obj/item/multitool/hacktool = 1
)
id_iff = IFF_LONER
@@ -320,8 +320,8 @@
/obj/item/clothing/glasses/sunglasses/big,
/obj/item/clothing/glasses/sunglasses/visor
)
l_ear = /obj/item/device/radio/headset/raider
l_pocket = /obj/item/device/special_uplink/raider
l_ear = /obj/item/radio/headset/raider
l_pocket = /obj/item/special_uplink/raider
r_pocket = list(
/obj/item/clothing/glasses/eyepatch/hud/thermal,
/obj/item/clothing/glasses/thermal,
@@ -420,9 +420,9 @@
/obj/item/clothing/wrists/watch/spy
)
l_ear = /obj/item/device/radio/headset/burglar
l_ear = /obj/item/radio/headset/burglar
l_pocket = /obj/item/syndie/teleporter
r_pocket = /obj/item/device/special_uplink/burglar
r_pocket = /obj/item/special_uplink/burglar
id = /obj/item/storage/wallet
r_hand = /obj/item/storage/briefcase/black
@@ -515,12 +515,12 @@
backpack_contents = list(
/obj/item/storage/box/survival/engineer = 1,
/obj/item/device/flashlight = 1,
/obj/item/flashlight = 1,
/obj/item/card/emag = 1
)
l_ear = /obj/item/device/radio/headset/jockey
r_pocket = /obj/item/device/special_uplink/jockey
l_ear = /obj/item/radio/headset/jockey
r_pocket = /obj/item/special_uplink/jockey
id = /obj/item/storage/wallet
id_iff = IFF_JOCKEY
@@ -555,7 +555,7 @@
uniform = /obj/item/clothing/under/kilt
head = /obj/item/clothing/head/beret/red
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/device/radio/headset/heads/captain
l_ear = /obj/item/radio/headset/heads/captain
l_hand = /obj/item/material/sword
l_pocket = /obj/item/pinpointer
@@ -614,7 +614,7 @@
belt = /obj/item/storage/belt/fannypack/component
gloves = null
l_ear = /obj/item/device/radio/headset/bluespace
l_ear = /obj/item/radio/headset/bluespace
l_pocket = /obj/item/technomancer_catalog/apprentice
r_pocket = null
id = /obj/item/storage/wallet/random
@@ -693,7 +693,7 @@
name = "Bluespace Golem"
allow_backbag_choice = FALSE
l_ear = /obj/item/device/radio/headset/bluespace
l_ear = /obj/item/radio/headset/bluespace
id_iff = IFF_BLUESPACE
/obj/outfit/admin/techomancer
@@ -701,10 +701,10 @@
allow_backbag_choice = FALSE
head = /obj/item/clothing/head/chameleon/technomancer
l_ear = /obj/item/device/radio/headset/bluespace
l_ear = /obj/item/radio/headset/bluespace
uniform = /obj/item/clothing/under/chameleon/technomancer
suit = /obj/item/clothing/suit/chameleon/technomancer
belt = /obj/item/device/flashlight
belt = /obj/item/flashlight
back = /obj/item/technomancer_core
shoes = /obj/item/clothing/shoes/chameleon/technomancer
@@ -760,7 +760,7 @@
name = "Technomancer Golem"
head = null
l_ear = /obj/item/device/radio/headset/bluespace
l_ear = /obj/item/radio/headset/bluespace
uniform = null
suit = null
belt = null