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

Military/Irregular Third Party Ship Improvements (#15064)

Browse Source
This commit is contained in:
TheDanseMacabre
2022-11-13 00:34:46 -03:00
committed by GitHub
parent 75b09902c5
commit e1ea7aa61d
18 changed files with 846 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/random.dm
+84
View File
@@ -1960,3 +1960,87 @@
/obj/random/wizard_dressup/post_spawn(obj/thing)
var/obj/item/clothing/head/wizard/H = pick(typesof(/obj/item/clothing/head/wizard))
new H(loc)
/obj/random/civgun
name = "random civilian handgun"
desc = "This is a random civilian gun."
icon = 'icons/obj/guns/xenoblaster.dmi'
icon_state = "random"
has_postspawn = TRUE
spawnlist = list(
/obj/item/gun/projectile/leyon,
/obj/item/gun/energy/blaster,
/obj/item/gun/energy/pistol,
/obj/item/gun/projectile/revolver/detective,
/obj/item/gun/projectile/sec/lethal,
/obj/item/gun/projectile/colt,
/obj/item/gun/projectile/pistol,
/obj/item/gun/projectile/pistol/detective,
/obj/item/gun/projectile/pistol/adhomai,
/obj/item/gun/projectile/pistol/sol,
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/projectile/revolver/lemat,
/obj/item/gun/projectile/tanto,
/obj/item/gun/projectile/automatic/x9,
/obj/item/gun/energy/disruptorpistol,
/obj/item/gun/energy/retro,
)
/obj/random/civgun/post_spawn(var/obj/item/gun/projectile/spawned)
if(istype(spawned, /obj/item/gun/energy))
return
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)
/obj/random/civgun/rifle
name = "random civilian longarm"
desc = "This is a random civilian long gun."
icon = 'icons/obj/guns/xenoblaster.dmi'
icon_state = "random"
has_postspawn = TRUE
spawnlist = list(
/obj/item/gun/projectile/automatic/mini_uzi,
/obj/item/gun/projectile/automatic/c20r,
/obj/item/gun/projectile/automatic/wt550/lethal,
/obj/item/gun/projectile/automatic/rifle/carbine,
/obj/item/gun/projectile/automatic/rifle/carbine/civcarbine,
/obj/item/gun/projectile/automatic/tommygun,
/obj/item/gun/projectile/shotgun/pump/rifle,
/obj/item/gun/projectile/shotgun/pump/rifle/pipegun,
/obj/item/gun/projectile/shotgun/pump/rifle/obrez,
/obj/item/gun/projectile/contender,
/obj/item/gun/projectile/shotgun/pump/rifle/vintage,
/obj/item/gun/projectile/gauss,
/obj/item/gun/projectile/gauss/carbine,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/doublebarrel,
/obj/item/gun/projectile/shotgun/doublebarrel/sawn,
/obj/item/gun/projectile/shotgun/foldable,
/obj/item/gun/projectile/revolver,
/obj/item/gun/energy/blaster/carbine,
/obj/item/gun/energy/laser/shotgun,
/obj/item/gun/energy/rifle,
/obj/item/gun/energy/rifle/laser,
/obj/item/gun/energy/gun,
/obj/item/gun/custom_ka/frame04/illegal,
/obj/item/gun/projectile/automatic/lebman,
/obj/item/gun/projectile/pistol/super_heavy,
/obj/item/gun/projectile/deagle,
/obj/item/gun/custom_ka/frame01/illegal
)