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

Fixes a problem with weapon_and_ammo (#9791)

Browse Source
This commit is contained in:
fernerr
2020-08-26 14:35:05 -03:00
committed by GitHub
parent 1d707cc0fa
commit a015493260
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/random.dm
+7 -5
View File
@@ -1537,10 +1537,6 @@
var/obj/item/ammo_magazine/am = spawned.magazine_type
new am(spawned.loc)
new am(spawned.loc)
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/shotgun) && spawned.caliber == "shotgun")
if(istype(spawned.loc, /obj/item/storage/box))
spawned.loc.icon_state = "largebox"
@@ -1548,8 +1544,14 @@
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++)
new spawned.ammo_type(spawned.loc)
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)
/obj/random/weapon_and_ammo/spawn_item()
var/obj/item/W = pick_gun()