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

Ammo boxes now return materials properly. (#17407)

Browse Source 
* Initializes materials for ammo boxes correctly.

* Update code/modules/projectiles/ammunition.dm

Fixes spacing.

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Update code/modules/projectiles/ammunition.dm

Also fixes spacing.

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Removes unncessary variable (mats_initialized).

* Simplifies null check

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Dragonkiller93
2022-03-08 03:34:36 -08:00
committed by GitHub
parent 21209687f4
commit d8fc832dbc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,8 +123,6 @@
for(var/i in 1 to max_ammo)
stored_ammo += new ammo_type(src)
update_icon()
initial_mats = materials.Copy()
update_mat_value()
/obj/item/ammo_box/Destroy()
QDEL_LIST(stored_ammo)
@@ -139,6 +137,8 @@
stored_ammo -= b
if(keep)
stored_ammo.Insert(1,b)
if(!initial_mats)
initial_mats = materials.Copy()
update_mat_value()
update_icon()
return b