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

Increases raider starting loadout diversity (#9839)

Browse Source
This commit is contained in:
fernerr
2020-09-03 11:00:25 +02:00
committed by GitHub
parent 0cd045ff10
commit d36a78471e
10 changed files with 300 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/outfit_antag.dm
+148 -21
View File
@@ -173,64 +173,191 @@
/obj/item/clothing/under/serviceoveralls,
/obj/item/clothing/under/det,
/obj/item/clothing/under/brown,
/obj/item/clothing/under/syndicate/tracksuit
/obj/item/clothing/under/syndicate/tracksuit,
/obj/item/clothing/under/captainformal,
/obj/item/clothing/under/dominia,
/obj/item/clothing/under/dominia/lyodsuit/hoodie,
/obj/item/clothing/under/elyra_holo/masc,
/obj/item/clothing/under/kilt,
/obj/item/clothing/under/lance,
/obj/item/clothing/under/legion/pilot,
/obj/item/clothing/under/offworlder,
/obj/item/clothing/under/pants,
/obj/item/clothing/under/pants/camo,
/obj/item/clothing/under/pants/khaki,
/obj/item/clothing/under/pants/musthang,
/obj/item/clothing/under/rank/bartender,
/obj/item/clothing/under/rank/cargo,
/obj/item/clothing/under/rank/chef,
/obj/item/clothing/under/rank/chaplain,
/obj/item/clothing/under/rank/engineer,
/obj/item/clothing/under/rank/fatigues,
/obj/item/clothing/under/rank/miner,
/obj/item/clothing/under/skirt/offworlder,
/obj/item/clothing/under/suit_jacket/tan,
/obj/item/clothing/under/tactical,
/obj/item/clothing/under/tajaran,
/obj/item/clothing/under/tajaran/nt,
/obj/item/clothing/under/rank/hephaestus/tech,
/obj/item/clothing/under/unathi,
/obj/item/clothing/under/waiter
)
suit = list(
/obj/item/clothing/suit/pirate,
/obj/item/clothing/suit/hgpirate,
/obj/item/clothing/suit/storage/toggle/bomber,
/obj/item/clothing/suit/storage/toggle/leather_jacket,
/obj/item/clothing/suit/storage/toggle/brown_jacket,
/obj/item/clothing/suit/unathi/mantle,
/obj/item/clothing/accessory/poncho,
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/grey
/obj/item/clothing/accessory/poncho/purple,
/obj/item/clothing/accessory/poncho/roles/cloak/captain,
/obj/item/clothing/accessory/poncho/roles/cloak/cargo,
/obj/item/clothing/accessory/poncho/roles/cloak/mining,
/obj/item/clothing/accessory/poncho/roles/cloak/rd,
/obj/item/clothing/suit/apron/overalls/random,
/obj/item/clothing/suit/captunic/capjacket,
/obj/item/clothing/suit/ianshirt,
/obj/item/clothing/suit/storage/fib,
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random,
/obj/item/clothing/suit/storage/hooded/wintercoat,
/obj/item/clothing/suit/storage/hooded/wintercoat/red,
/obj/item/clothing/suit/storage/hooded/wintercoat/miner,
/obj/item/clothing/suit/storage/leathercoat,
/obj/item/clothing/suit/storage/vest/csi,
/obj/item/clothing/suit/storage/toggle/dominia/bomber,
/obj/item/clothing/suit/storage/toggle/dominia/gold,
/obj/item/clothing/suit/storage/toggle/flannel,
/obj/item/clothing/suit/storage/toggle/flannel/gray,
/obj/item/clothing/suit/storage/toggle/flannel/red,
/obj/item/clothing/suit/storage/toggle/himeo,
/obj/item/clothing/suit/storage/toggle/leather_vest,
/obj/item/clothing/suit/storage/toggle/leather_jacket,
/obj/item/clothing/suit/storage/toggle/leather_jacket/biker,
/obj/item/clothing/suit/storage/toggle/leather_jacket/flight,
/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/green,
/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/white,
/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/red,
/obj/item/clothing/suit/storage/toggle/leather_jacket/military,
/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old,
/obj/item/clothing/suit/storage/toggle/leather_jacket/military/tan,
/obj/item/clothing/suit/storage/toggle/tajaran,
/obj/item/clothing/suit/storage/toggle/trench,
/obj/item/clothing/suit/storage/toggle/trench/grey,
/obj/item/clothing/suit/storage/toggle/trench/colorable/random
)
shoes = list(
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/workboots,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/shoes/laceup
)
glasses = list(
/obj/item/clothing/glasses/thermal,
/obj/item/clothing/glasses/eyepatch/hud/thermal,
/obj/item/clothing/glasses/thermal/plain/monocle,
/obj/item/clothing/glasses/thermal/aviator
/obj/item/clothing/shoes/laceup/brown/all_species,
/obj/item/clothing/shoes/laceup/all_species,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/cowboy,
/obj/item/clothing/shoes/jackboots/knee,
/obj/item/clothing/shoes/lyodsuit,
/obj/item/clothing/shoes/winter,
/obj/item/clothing/shoes/hitops/black,
/obj/item/clothing/shoes/black,
/obj/item/clothing/shoes/brown
)
head = list(
/obj/item/clothing/head/bearpelt,
/obj/item/clothing/head/ushanka,
/obj/item/clothing/head/pirate,
/obj/item/clothing/head/bandana,
/obj/item/clothing/head/hgpiratecap
/obj/item/clothing/head/hgpiratecap,
/obj/item/clothing/head/beanie/random,
/obj/item/clothing/head/beaverhat,
/obj/item/clothing/head/cowboy,
/obj/item/clothing/head/fedora/brown,
/obj/item/clothing/head/fedora/grey,
/obj/item/clothing/head/fez,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/head/headbando/random,
/obj/item/clothing/head/helmet/formalcaptain,
/obj/item/clothing/head/hijab,
/obj/item/clothing/head/hijab/grey,
/obj/item/clothing/head/hijab/red,
/obj/item/clothing/head/navy/garrison,
/obj/item/clothing/head/nonla,
/obj/item/clothing/head/helmet/bucket,
/obj/item/clothing/head/helmet/material/makeshift/plasteel,
/obj/item/clothing/head/helmet/kettle,
/obj/item/clothing/head/helmet/tank/olive,
/obj/item/clothing/head/soft/grey,
/obj/item/clothing/head/soft/himeo,
/obj/item/clothing/head/soft/yellow,
/obj/item/clothing/head/that,
/obj/item/clothing/head/turban,
/obj/item/clothing/head/turban/grey,
/obj/item/clothing/head/welding
)
back = null
belt = null
gloves = null
l_ear = /obj/item/device/radio/headset/raider
r_pocket = null
id = /obj/item/storage/wallet
l_pocket = /obj/item/device/contract_uplink
r_pocket = list(
/obj/item/clothing/glasses/eyepatch/hud/thermal,
/obj/item/clothing/glasses/thermal,
/obj/item/clothing/glasses/thermal/aviator
)
id = /obj/item/storage/wallet/random
accessory = /obj/item/clothing/accessory/storage/webbing
backpack_contents = list()
/datum/outfit/admin/syndicate/raider/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
new /obj/random/backpack(H.loc)
var/obj/item/storage/backpack/bag
for(var/obj/item/storage/backpack/b in H.loc)
bag = b
break
if(bag)
new /obj/random/weapon_and_ammo/concealable(bag)
new /obj/random/weapon_and_ammo(bag)
for(var/obj/item/gun/G in bag)
if(G.slot_flags & SLOT_HOLSTER && !accessory_contents.len)
accessory_contents += G.type
qdel(G)
continue
if(G.slot_flags & SLOT_BELT && !belt)
belt = G.type
qdel(G)
continue
if(G.slot_flags & SLOT_BACK && !back)
back = G.type
qdel(G)
if(accessory_contents.len)
accessory = pick(typesof(/obj/item/clothing/accessory/holster) - typesof(/obj/item/clothing/accessory/holster/thigh/fluff))
if(!back)
H.equip_to_slot_or_del(bag, slot_back)
else
H.put_in_any_hand_if_possible(bag)
return ..()
/datum/outfit/admin/syndicate/raider/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
if(!H.shoes)
var/fallback_type = pick(/obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/jackboots/toeless)
var/fallback_type = pick(/obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/jackboots/toeless, /obj/item/clothing/shoes/laceup/brown/all_species, /obj/item/clothing/shoes/laceup/all_species)
H.equip_to_slot_or_del(new fallback_type(H), slot_shoes)
var/obj/item/storage/wallet/W = H.wear_id
var/obj/item/card/id/syndicate/raider/id = new(H)
id.name = "[H.real_name]'s Passport"
var/obj/item/card/id/syndicate/raider/passport = new(H.loc)
passport.name = "[H.real_name]'s Passport"
if(W)
W.handle_item_insertion(id)
spawn_money(rand(50,150)*10,W)
W.handle_item_insertion(passport)
/datum/outfit/admin/syndicate/raider/burglar
name = "Burglar"