cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +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
code/game/objects/items/weapons/grenades/custom_grenades.dm
+2 -2
View File
@@ -159,9 +159,9 @@
..()
CreateDefaultTrigger(/obj/item/assembly/mousetrap)
/obj/item/weapon/grenade/chem_grenade/explosion/mine_armed/New()
/obj/item/grenade/chem_grenade/explosion/mine_armed/New()
..()
CreateDefaultTrigger(/obj/item/device/assembly/mousetrap/armed)
CreateDefaultTrigger(/obj/item/assembly/mousetrap/armed)
// Water + Potassium = Boom
code/game/objects/items/weapons/storage/toolbox.dm
+1 -1
View File
@@ -89,7 +89,7 @@
/obj/item/storage/toolbox/syndicate/trapped/New()
..()
new /obj/item/weapon/grenade/chem_grenade/explosion/mine_armed(src)
new /obj/item/grenade/chem_grenade/explosion/mine_armed(src)
/obj/item/storage/toolbox/drone