cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +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/game/objects/random/random.dm
+46 -24
View File
@@ -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()