cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes merge conflicts with weapon removals

Browse Source
This commit is contained in:
Kyep
2018-04-26 00:09:18 -07:00
parent 08fdc2bce3
commit c3f271449e
7 changed files with 887 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/pizza_bomb.dm
+1 -1
View File
@@ -100,6 +100,6 @@
..()
correct_wire = pick(wires)
/obj/item/device/pizza_bomb/autoarm
/obj/item/pizza_bomb/autoarm
timer_set = 1
timer = 10