mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-02 13:32:32 +00:00
Increases raider starting loadout diversity (#9839)
This commit is contained in:
fernerr
GitHub
@@ -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"
|
||||
|
||||
@@ -21,57 +21,6 @@ var/datum/antagonist/raider/raiders
|
||||
|
||||
id_type = /obj/item/card/id/syndicate
|
||||
|
||||
var/list/raider_guns = list(
|
||||
/obj/item/gun/energy/rifle/laser,
|
||||
/obj/item/gun/energy/rifle/laser/xray,
|
||||
/obj/item/gun/energy/rifle/icelance,
|
||||
/obj/item/gun/energy/retro,
|
||||
/obj/item/gun/energy/xray,
|
||||
/obj/item/gun/energy/mindflayer,
|
||||
/obj/item/gun/energy/toxgun,
|
||||
/obj/item/gun/energy/stunrevolver,
|
||||
/obj/item/gun/energy/rifle/ionrifle,
|
||||
/obj/item/gun/energy/taser,
|
||||
/obj/item/gun/energy/crossbow/largecrossbow,
|
||||
/obj/item/gun/launcher/crossbow,
|
||||
/obj/item/gun/launcher/grenade,
|
||||
/obj/item/gun/launcher/pneumatic,
|
||||
/obj/item/gun/launcher/harpoon,
|
||||
/obj/item/gun/projectile/automatic/mini_uzi,
|
||||
/obj/item/gun/projectile/automatic/c20r,
|
||||
/obj/item/gun/projectile/automatic/wt550,
|
||||
/obj/item/gun/projectile/automatic/rifle/sts35,
|
||||
/obj/item/gun/projectile/automatic/tommygun,
|
||||
/obj/item/gun/projectile/automatic/x9,
|
||||
/obj/item/gun/projectile/silenced,
|
||||
/obj/item/gun/projectile/shotgun/pump,
|
||||
/obj/item/gun/projectile/shotgun/pump/combat,
|
||||
/obj/item/gun/projectile/shotgun/doublebarrel,
|
||||
/obj/item/gun/projectile/shotgun/doublebarrel/pellet,
|
||||
/obj/item/gun/projectile/shotgun/doublebarrel/sawn,
|
||||
/obj/item/gun/projectile/shotgun/pump/rifle,
|
||||
/obj/item/gun/projectile/shotgun/foldable,
|
||||
/obj/item/gun/projectile/colt,
|
||||
/obj/item/gun/projectile/sec,
|
||||
/obj/item/gun/projectile/pistol,
|
||||
/obj/item/gun/projectile/deagle,
|
||||
/obj/item/gun/projectile/revolver,
|
||||
/obj/item/gun/projectile/revolver/deckard,
|
||||
/obj/item/gun/projectile/revolver/derringer,
|
||||
/obj/item/gun/projectile/revolver/lemat,
|
||||
/obj/item/gun/projectile/contender,
|
||||
/obj/item/gun/projectile/pirate,
|
||||
/obj/item/gun/projectile/tanto,
|
||||
/obj/item/gun/projectile/shotgun/pump/rifle/vintage
|
||||
)
|
||||
|
||||
|
||||
var/list/raider_holster = list(
|
||||
/obj/item/clothing/accessory/holster/armpit,
|
||||
/obj/item/clothing/accessory/holster/waist,
|
||||
/obj/item/clothing/accessory/holster/hip
|
||||
)
|
||||
|
||||
/datum/antagonist/raider/New()
|
||||
..()
|
||||
raiders = src
|
||||
@@ -187,86 +136,11 @@ var/datum/antagonist/raider/raiders
|
||||
player.force_update_limbs()
|
||||
player.update_eyes()
|
||||
player.regenerate_icons()
|
||||
equip_weapons(player)
|
||||
|
||||
//Try to equip it, del if we fail.
|
||||
var/obj/item/device/contract_uplink/new_uplink = new()
|
||||
if (!player.equip_to_appropriate_slot(new_uplink))
|
||||
qdel(new_uplink)
|
||||
|
||||
give_codewords(player)
|
||||
|
||||
return 1
|
||||
|
||||
/datum/antagonist/raider/proc/equip_weapons(var/mob/living/carbon/human/player)
|
||||
var/new_gun = pick(raider_guns)
|
||||
var/new_holster = pick(raider_holster) //raiders don't start with any backpacks, so let's be nice and give them a holster if they can use it.
|
||||
var/turf/T = get_turf(player)
|
||||
|
||||
var/obj/item/primary = new new_gun(T)
|
||||
var/obj/item/clothing/accessory/holster/holster = null
|
||||
|
||||
//Give some of the raiders a pirate gun as a secondary
|
||||
if(prob(60))
|
||||
var/obj/item/secondary = new /obj/item/gun/projectile/pirate(T)
|
||||
if(!(primary.slot_flags & SLOT_HOLSTER))
|
||||
holster = new new_holster(T)
|
||||
holster.holstered = secondary
|
||||
secondary.forceMove(holster)
|
||||
else
|
||||
player.equip_to_slot_or_del(secondary, slot_belt)
|
||||
|
||||
if(primary.slot_flags & SLOT_HOLSTER)
|
||||
holster = new new_holster(T)
|
||||
holster.holstered = primary
|
||||
primary.forceMove(holster)
|
||||
else if(!player.belt && (primary.slot_flags & SLOT_BELT))
|
||||
player.equip_to_slot_or_del(primary, slot_belt)
|
||||
else if(!player.back && (primary.slot_flags & SLOT_BACK))
|
||||
player.equip_to_slot_or_del(primary, slot_back)
|
||||
else
|
||||
player.put_in_any_hand_if_possible(primary)
|
||||
|
||||
//If they got a projectile gun, give them a little bit of spare ammo
|
||||
equip_ammo(player, primary)
|
||||
|
||||
if(holster)
|
||||
var/obj/item/clothing/under/uniform = player.w_uniform
|
||||
if(istype(uniform) && uniform.can_attach_accessory(holster))
|
||||
uniform.attackby(holster, player)
|
||||
else
|
||||
player.put_in_any_hand_if_possible(holster)
|
||||
|
||||
/datum/antagonist/raider/proc/equip_ammo(var/mob/living/carbon/human/player, var/obj/item/gun/gun)
|
||||
if(istype(gun, /obj/item/gun/projectile))
|
||||
var/obj/item/gun/projectile/bullet_thrower = gun
|
||||
if(bullet_thrower.magazine_type)
|
||||
player.equip_to_slot_or_del(new bullet_thrower.magazine_type(player), slot_l_store)
|
||||
if(prob(20)) //don't want to give them too much
|
||||
player.equip_to_slot_or_del(new bullet_thrower.magazine_type(player), slot_r_store)
|
||||
else if(bullet_thrower.ammo_type)
|
||||
var/obj/item/storage/box/ammobox = new(get_turf(player.loc))
|
||||
for(var/i in 1 to rand(3,5) + rand(0,2))
|
||||
new bullet_thrower.ammo_type(ammobox)
|
||||
player.put_in_any_hand_if_possible(ammobox)
|
||||
return
|
||||
if(istype(gun, /obj/item/gun/launcher/grenade))
|
||||
var/list/grenades = list(
|
||||
/obj/item/grenade/empgrenade,
|
||||
/obj/item/grenade/smokebomb,
|
||||
/obj/item/grenade/flashbang
|
||||
)
|
||||
var/obj/item/storage/box/ammobox = new(get_turf(player.loc))
|
||||
for(var/i in 1 to 7)
|
||||
var/grenade_type = pick(grenades)
|
||||
new grenade_type(ammobox)
|
||||
player.put_in_any_hand_if_possible(ammobox)
|
||||
if(istype(gun, /obj/item/gun/launcher/harpoon))
|
||||
var/obj/item/storage/backpack/duffel/bag = new(get_turf(player))
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/material/harpoon(bag)
|
||||
player.put_in_any_hand_if_possible(bag)
|
||||
|
||||
/datum/antagonist/raider/proc/equip_vox(var/mob/living/carbon/human/player)
|
||||
|
||||
player.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(player), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES.
|
||||
|
||||
@@ -1445,12 +1445,12 @@
|
||||
/obj/item/gun/energy/retro = 0.5,
|
||||
/obj/item/gun/energy/toxgun = 0.5,
|
||||
/obj/item/gun/projectile/automatic/improvised = 1,
|
||||
/obj/item/gun/projectile/contender = 1,
|
||||
/obj/item/gun/projectile/contender = 0.5,
|
||||
/obj/item/gun/projectile/leyon = 1,
|
||||
/obj/item/gun/projectile/revolver/derringer = 1,
|
||||
/obj/item/gun/projectile/shotgun/pump/rifle/obrez = 1,
|
||||
/obj/item/gun/projectile/shotgun/pump/rifle/vintage = 1,
|
||||
/obj/item/gun/launcher/harpoon = 0.5
|
||||
/obj/item/gun/launcher/harpoon = 1
|
||||
)
|
||||
|
||||
var/list/Common = list(
|
||||
@@ -1461,6 +1461,7 @@
|
||||
/obj/item/gun/energy/rifle = 1,
|
||||
/obj/item/gun/projectile/automatic/c20r = 1,
|
||||
/obj/item/gun/projectile/automatic/mini_uzi = 1,
|
||||
/obj/item/gun/projectile/automatic/tommygun = 1,
|
||||
/obj/item/gun/projectile/automatic/wt550/lethal = 0.5,
|
||||
/obj/item/gun/projectile/colt = 0.5,
|
||||
/obj/item/gun/projectile/pistol/sol = 1,
|
||||
@@ -1481,6 +1482,7 @@
|
||||
/obj/item/gun/energy/blaster/rifle = 1,
|
||||
/obj/item/gun/energy/pistol/hegemony = 1,
|
||||
/obj/item/gun/energy/rifle/laser = 1,
|
||||
/obj/item/gun/energy/rifle/icelance = 1,
|
||||
/obj/item/gun/energy/rifle/ionrifle = 0.5,
|
||||
/obj/item/gun/energy/vaurca/blaster = 1,
|
||||
/obj/item/gun/energy/xray = 1,
|
||||
@@ -1491,13 +1493,14 @@
|
||||
/obj/item/gun/projectile/deagle/adhomai = 1,
|
||||
/obj/item/gun/projectile/silenced = 1,
|
||||
/obj/item/gun/projectile/dragunov = 1,
|
||||
/obj/item/gun/projectile/plasma/bolter = 1,
|
||||
/obj/item/gun/projectile/plasma/bolter = 0.5,
|
||||
/obj/item/gun/projectile/shotgun/doublebarrel/sawn = 1,
|
||||
/obj/item/gun/projectile/shotgun/foldable = 1,
|
||||
/obj/item/gun/projectile/shotgun/pump/combat = 1,
|
||||
/obj/item/gun/projectile/shotgun/pump/combat/sol = 1,
|
||||
/obj/item/gun/projectile/automatic/rifle/adhomian = 1,
|
||||
/obj/item/gun/projectile/musket = 0.5
|
||||
/obj/item/gun/projectile/musket = 0.5,
|
||||
/obj/item/gun/launcher/grenade = 1
|
||||
)
|
||||
|
||||
var/list/Epic = list(
|
||||
@@ -1515,7 +1518,8 @@
|
||||
/obj/item/gun/projectile/automatic/rifle/z8 = 1,
|
||||
/obj/item/gun/projectile/cannon = 1,
|
||||
/obj/item/gun/projectile/gyropistol = 0.5,
|
||||
/obj/item/gun/projectile/plasma = 1
|
||||
/obj/item/gun/projectile/plasma = 0.5,
|
||||
/obj/item/gun/projectile/revolver = 0.5
|
||||
)
|
||||
|
||||
var/list/Legendary = list(
|
||||
@@ -1533,27 +1537,45 @@
|
||||
concealable = TRUE
|
||||
|
||||
/obj/random/weapon_and_ammo/post_spawn(var/obj/item/gun/projectile/spawned)
|
||||
if(!istype(spawned, /obj/item/gun/projectile))
|
||||
if(istype(spawned, /obj/item/gun/energy))
|
||||
return
|
||||
if(spawned.magazine_type)
|
||||
var/obj/item/ammo_magazine/am = spawned.magazine_type
|
||||
new am(spawned.loc)
|
||||
new am(spawned.loc)
|
||||
else if(istype(spawned, /obj/item/gun/projectile/shotgun) && spawned.caliber == "shotgun")
|
||||
if(istype(spawned.loc, /obj/item/storage/box))
|
||||
spawned.loc.icon_state = "largebox"
|
||||
var/obj/item/storage/box/b = new /obj/item/storage/box(spawned.loc)
|
||||
for(var/i = 0; i < 8; i++)
|
||||
new spawned.ammo_type(b)
|
||||
else if(spawned.ammo_type)
|
||||
var/list/provided_ammo = list()
|
||||
for(var/i = 0; i < (spawned.max_shells * 2); i++)
|
||||
provided_ammo += new spawned.ammo_type(spawned.loc)
|
||||
if(provided_ammo.len)
|
||||
new /obj/item/ammo_pile(spawned.loc, provided_ammo)
|
||||
|
||||
if(istype(spawned, /obj/item/gun/projectile/musket))
|
||||
new /obj/item/reagent_containers/powder_horn(spawned.loc)
|
||||
else if(istype(spawned, /obj/item/gun/projectile))
|
||||
if(spawned.magazine_type)
|
||||
var/obj/item/ammo_magazine/am = spawned.magazine_type
|
||||
new am(spawned.loc)
|
||||
new am(spawned.loc)
|
||||
else if(istype(spawned, /obj/item/gun/projectile/shotgun) && spawned.caliber == "shotgun")
|
||||
if(istype(spawned.loc, /obj/item/storage/box))
|
||||
spawned.loc.icon_state = "largebox"
|
||||
var/obj/item/storage/box/b = new /obj/item/storage/box(spawned.loc)
|
||||
for(var/i = 0; i < 8; i++)
|
||||
new spawned.ammo_type(b)
|
||||
else if(spawned.ammo_type)
|
||||
var/list/provided_ammo = list()
|
||||
for(var/i = 0; i < (spawned.max_shells * 2); i++)
|
||||
provided_ammo += new spawned.ammo_type(spawned.loc)
|
||||
if(provided_ammo.len)
|
||||
new /obj/item/ammo_pile(spawned.loc, provided_ammo)
|
||||
|
||||
if(istype(spawned, /obj/item/gun/projectile/musket))
|
||||
new /obj/item/reagent_containers/powder_horn(spawned.loc)
|
||||
|
||||
else if(istype(spawned, /obj/item/gun/launcher))
|
||||
if(istype(spawned, /obj/item/gun/launcher/harpoon))
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/material/harpoon(spawned.loc)
|
||||
if(istype(spawned, /obj/item/gun/launcher/grenade))
|
||||
var/list/grenade_types = list(
|
||||
/obj/item/grenade/smokebomb,
|
||||
/obj/item/grenade/flashbang,
|
||||
/obj/item/grenade/empgrenade,
|
||||
/obj/item/grenade/chem_grenade/incendiary
|
||||
)
|
||||
var/obj/item/storage/bag/plasticbag/bag = new /obj/item/storage/bag/plasticbag(spawned.loc)
|
||||
for(var/i in 1 to 7)
|
||||
var/chosen_type = pick(grenade_types)
|
||||
new chosen_type(bag)
|
||||
|
||||
/obj/random/weapon_and_ammo/spawn_item()
|
||||
var/obj/item/W = pick_gun()
|
||||
|
||||
@@ -412,6 +412,10 @@
|
||||
icon_state = "headbando"
|
||||
item_state = "headbando"
|
||||
|
||||
/obj/item/clothing/head/headbando/random/Initialize()
|
||||
. = ..()
|
||||
color = get_random_colour(lower = 150)
|
||||
|
||||
/obj/item/clothing/head/fedora/brown
|
||||
name = "fedora"
|
||||
desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
|
||||
@@ -434,6 +438,11 @@
|
||||
desc = "A head-hugging brimless winter cap. This one is tight."
|
||||
icon_state = "beanie"
|
||||
item_state = "beanie"
|
||||
|
||||
/obj/item/clothing/head/beanie/random/Initialize()
|
||||
. = ..()
|
||||
color = get_random_colour(lower = 150)
|
||||
|
||||
//Flower crowns
|
||||
|
||||
/obj/item/clothing/head/sunflower_crown
|
||||
|
||||
@@ -222,6 +222,10 @@
|
||||
color = "#777777"
|
||||
|
||||
|
||||
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random/Initialize()
|
||||
. = ..()
|
||||
color = get_random_colour(lower = 150)
|
||||
|
||||
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/short
|
||||
icon_state = "hoodie_short"
|
||||
item_state = "hoodie_short"
|
||||
|
||||
@@ -26,6 +26,10 @@ obj/item/clothing/suit/apron/colored
|
||||
icon_state = "overalls"
|
||||
item_state = "overalls"
|
||||
|
||||
/obj/item/clothing/suit/apron/overalls/random/Initialize()
|
||||
. = ..()
|
||||
color = get_random_colour(lower = 150)
|
||||
|
||||
obj/item/clothing/suit/apron/overalls/blue
|
||||
color = "#3429d1"
|
||||
|
||||
|
||||
@@ -443,6 +443,10 @@
|
||||
icon_open = "trench_colorable_open"
|
||||
icon_closed = "trench_colorable"
|
||||
|
||||
/obj/item/clothing/suit/storage/toggle/trench/colorable/random/Initialize()
|
||||
. = ..()
|
||||
color = get_random_colour(lower = 150)
|
||||
|
||||
/obj/item/clothing/suit/storage/toggle/track
|
||||
name = "track jacket"
|
||||
desc = "a track jacket, for the athletic."
|
||||
|
||||
@@ -240,6 +240,8 @@
|
||||
load_method = MAGAZINE
|
||||
handle_casings = DELETE_CASINGS
|
||||
|
||||
slot_flags = SLOT_BACK
|
||||
|
||||
fire_delay = 25
|
||||
accuracy = -1
|
||||
|
||||
|
||||
4
html/changelogs/Ferner-200829-coding_raideroutfit.yml
Normal file
4
html/changelogs/Ferner-200829-coding_raideroutfit.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: Ferner
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "Greatly expanded the raider starting clothing/gun variety. They'll now have a chance of getting almost any gun in the game, but don't expect auto-revolvers or nuke launchers every single time."
|
||||
@@ -34,8 +34,10 @@
|
||||
layer = 2.4;
|
||||
name = "conveyor"
|
||||
},
|
||||
/obj/structure/closet/crate/loot,
|
||||
/obj/random/backpack,
|
||||
/obj/structure/closet/crate/loot{
|
||||
desc = "The old dusty labels on this crate indicate that it was supposed to be shipped long ago.";
|
||||
name = "forgotten shipment"
|
||||
},
|
||||
/turf/unsimulated/floor/plating,
|
||||
/area/antag/raider)
|
||||
"aad" = (
|
||||
@@ -2875,6 +2877,7 @@
|
||||
/obj/structure/table/steel,
|
||||
/obj/item/clothing/head/pirate,
|
||||
/obj/item/clothing/suit/pirate,
|
||||
/obj/item/clothing/glasses/thermal/plain/monocle,
|
||||
/turf/simulated/floor/carpet/art,
|
||||
/area/shuttle/skipjack)
|
||||
"amx" = (
|
||||
@@ -2923,9 +2926,8 @@
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/storage/box/fancy/cigarettes,
|
||||
/obj/item/flame/lighter/zippo,
|
||||
/obj/structure/table/steel,
|
||||
/obj/random/melee,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/shuttle/skipjack)
|
||||
"amU" = (
|
||||
@@ -3068,8 +3070,10 @@
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/clothing/glasses/thermal/plain/monocle,
|
||||
/obj/structure/table/steel,
|
||||
/obj/item/reagent_containers/food/drinks/flask/barflask{
|
||||
pixel_y = 5
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/shuttle/skipjack)
|
||||
"anM" = (
|
||||
@@ -10238,6 +10242,8 @@
|
||||
/obj/item/tank/oxygen,
|
||||
/obj/item/clothing/shoes/magboots,
|
||||
/obj/item/clothing/shoes/magboots,
|
||||
/obj/item/clothing/mask/breath,
|
||||
/obj/item/clothing/mask/breath,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/table/steel,
|
||||
/turf/simulated/floor/tiled,
|
||||
@@ -12427,7 +12433,6 @@
|
||||
},
|
||||
/area/centcom/spawning)
|
||||
"aOo" = (
|
||||
/obj/item/gun/energy/rifle/ionrifle,
|
||||
/obj/item/material/harpoon,
|
||||
/obj/item/tank/oxygen,
|
||||
/obj/item/clothing/shoes/magboots,
|
||||
@@ -12440,6 +12445,7 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/table/steel,
|
||||
/obj/item/clothing/suit/space/void/merc,
|
||||
/obj/item/clothing/mask/breath,
|
||||
/obj/item/clothing/head/helmet/space/void/merc,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/shuttle/skipjack)
|
||||
@@ -12456,6 +12462,7 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/table/steel,
|
||||
/obj/item/clothing/suit/space/void/engineering,
|
||||
/obj/item/clothing/mask/breath,
|
||||
/obj/item/clothing/head/helmet/space/void/engineering,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/shuttle/skipjack)
|
||||
@@ -14066,7 +14073,6 @@
|
||||
/area/antag/ninja)
|
||||
"aVj" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/random/energy_antag,
|
||||
/obj/random/melee,
|
||||
/obj/structure/lattice/catwalk/indoor/grate,
|
||||
/turf/simulated/floor/plating,
|
||||
@@ -14803,6 +14809,15 @@
|
||||
icon_state = "wood"
|
||||
},
|
||||
/area/centcom/living)
|
||||
"aYm" = (
|
||||
/obj/structure/closet/crate/loot{
|
||||
desc = "The old dusty labels on this crate indicate that it was supposed to be shipped long ago.";
|
||||
name = "forgotten shipment"
|
||||
},
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "steel_dirty"
|
||||
},
|
||||
/area/antag/raider)
|
||||
"aYo" = (
|
||||
/obj/structure/banner,
|
||||
/turf/unsimulated/floor{
|
||||
@@ -15898,6 +15913,8 @@
|
||||
/obj/structure/table/steel,
|
||||
/obj/item/paper_bin,
|
||||
/obj/item/pen,
|
||||
/obj/item/flame/lighter/zippo,
|
||||
/obj/item/storage/box/fancy/cigarettes,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/shuttle/skipjack)
|
||||
"bWj" = (
|
||||
@@ -18426,9 +18443,11 @@
|
||||
/turf/unsimulated/floor/plating,
|
||||
/area/shuttle/legion)
|
||||
"edH" = (
|
||||
/obj/structure/closet/crate/loot,
|
||||
/obj/random/backpack,
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/structure/closet/crate/loot{
|
||||
desc = "The old dusty labels on this crate indicate that it was supposed to be shipped long ago.";
|
||||
name = "forgotten shipment"
|
||||
},
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "tiles"
|
||||
},
|
||||
@@ -23285,6 +23304,16 @@
|
||||
},
|
||||
/turf/simulated/floor/shuttle/black,
|
||||
/area/shuttle/escape)
|
||||
"ise" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/closet/crate/loot{
|
||||
desc = "The old dusty labels on this crate indicate that it was supposed to be shipped long ago.";
|
||||
name = "forgotten shipment"
|
||||
},
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "tiles"
|
||||
},
|
||||
/area/antag/raider)
|
||||
"ish" = (
|
||||
/obj/machinery/status_display/arrivals_display{
|
||||
layer = 3
|
||||
@@ -26002,9 +26031,11 @@
|
||||
dir = 4;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/obj/structure/closet/crate/loot,
|
||||
/obj/random/backpack,
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/structure/closet/crate/loot{
|
||||
desc = "The old dusty labels on this crate indicate that it was supposed to be shipped long ago.";
|
||||
name = "forgotten shipment"
|
||||
},
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "tiles"
|
||||
},
|
||||
@@ -27309,8 +27340,6 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/closet/crate/loot,
|
||||
/obj/random/backpack,
|
||||
/obj/machinery/conveyor{
|
||||
dir = 8;
|
||||
id = "hideout_shipping"
|
||||
@@ -29438,6 +29467,12 @@
|
||||
/obj/structure/sign/electricshock,
|
||||
/turf/unsimulated/wall/darkshuttlewall,
|
||||
/area/centcom/legion)
|
||||
"nIj" = (
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "tiles"
|
||||
},
|
||||
/area/antag/raider)
|
||||
"nJM" = (
|
||||
/obj/structure/shuttle_part/distress{
|
||||
icon_state = "10,0";
|
||||
@@ -34164,6 +34199,17 @@
|
||||
},
|
||||
/turf/unsimulated/floor/plating,
|
||||
/area/centcom/legion)
|
||||
"sdF" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/closet/crate/loot{
|
||||
desc = "The old dusty labels on this crate indicate that it was supposed to be shipped long ago.";
|
||||
name = "forgotten shipment"
|
||||
},
|
||||
/turf/unsimulated/floor{
|
||||
dir = 4;
|
||||
icon_state = "brown"
|
||||
},
|
||||
/area/antag/raider)
|
||||
"sdS" = (
|
||||
/obj/structure/bed,
|
||||
/obj/item/toy/figure/syndie,
|
||||
@@ -37484,8 +37530,6 @@
|
||||
/area/centcom/legion)
|
||||
"vdU" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/closet/crate/loot,
|
||||
/obj/random/backpack,
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "steel_dirty"
|
||||
@@ -38105,8 +38149,6 @@
|
||||
/obj/structure/window/reinforced/crescent{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/closet/crate/loot,
|
||||
/obj/random/backpack,
|
||||
/obj/effect/decal/fake_object{
|
||||
dir = 4;
|
||||
icon = 'icons/obj/recycling.dmi';
|
||||
@@ -38114,6 +38156,10 @@
|
||||
layer = 2.4;
|
||||
name = "conveyor"
|
||||
},
|
||||
/obj/structure/closet/crate/loot{
|
||||
desc = "The old dusty labels on this crate indicate that it was supposed to be shipped long ago.";
|
||||
name = "forgotten shipment"
|
||||
},
|
||||
/turf/unsimulated/floor/plating,
|
||||
/area/antag/raider)
|
||||
"vMb" = (
|
||||
@@ -40353,6 +40399,17 @@
|
||||
icon_state = "floor"
|
||||
},
|
||||
/area/centcom/legion)
|
||||
"xvu" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/structure/closet/crate/loot{
|
||||
desc = "The old dusty labels on this crate indicate that it was supposed to be shipped long ago.";
|
||||
name = "forgotten shipment"
|
||||
},
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "steel_dirty"
|
||||
},
|
||||
/area/antag/raider)
|
||||
"xvz" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 1
|
||||
@@ -63766,7 +63823,7 @@ ahV
|
||||
aiQ
|
||||
lxL
|
||||
iYt
|
||||
iYt
|
||||
sdF
|
||||
aiQ
|
||||
fHj
|
||||
ajW
|
||||
@@ -64288,7 +64345,7 @@ ajW
|
||||
ajW
|
||||
scd
|
||||
rvL
|
||||
rvL
|
||||
aYm
|
||||
aiY
|
||||
aaM
|
||||
aaM
|
||||
@@ -64535,7 +64592,7 @@ aaM
|
||||
ahV
|
||||
ahV
|
||||
bPL
|
||||
qnN
|
||||
ise
|
||||
qnN
|
||||
qnN
|
||||
tvo
|
||||
@@ -64799,10 +64856,10 @@ aiQ
|
||||
yfl
|
||||
scd
|
||||
ajW
|
||||
edH
|
||||
nIj
|
||||
scd
|
||||
fHj
|
||||
vdU
|
||||
xvu
|
||||
aiY
|
||||
aaM
|
||||
aaM
|
||||
|
||||
Reference in New Issue
Block a user