cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12934 from farie82/Item-armor-fix

Browse Source 
Make every obj/.../New() call it's parents, Fixes things not burning on lava and causing runtimes
This commit is contained in:
Fox McCloud
2020-02-24 19:42:19 -05:00
committed by GitHub
parent 4fcedcf4bd 5ca4ea4025
commit 306fdd6629
39 changed files with 89 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/projectiles/ammunition.dm
View File

@@ -102,6 +102,7 @@
var/list/initial_mats //For calculating refund values.
/obj/item/ammo_box/New()
..()
for(var/i in 1 to max_ammo)
stored_ammo += new ammo_type(src)
update_icon()

2
code/modules/projectiles/ammunition/magazines.dm
View File

@@ -157,6 +157,8 @@
multiload = 0
/obj/item/ammo_box/magazine/internal/rus357/New()
..()
stored_ammo.Cut() // We only want 1 bullet in there
stored_ammo += new ammo_type(src)
/obj/item/ammo_box/magazine/internal/boltaction