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

Merge pull request #10422 from Kyep/depot_update_4

Browse Source 
Depot Update
This commit is contained in:
variableundefined
2018-12-13 23:06:29 +08:00
committed by GitHub
parent b7738b872e 3c10bcbebf
commit 16a064d1e6
12 changed files with 376 additions and 338 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
@@ -102,4 +102,4 @@
/obj/item/pizza_bomb/autoarm
timer_set = 1
timer = 10
timer = 30 // 3 seconds
code/game/objects/items/weapons/storage/toolbox.dm
-10
View File
@@ -94,16 +94,6 @@
new /obj/item/multitool(src)
new /obj/item/clothing/gloves/combat(src)
/obj/item/storage/toolbox/syndicate/trapped
name = "suspicious looking toolbox"
desc = "Danger. Very robust. Has a small red marker by the handle."
/obj/item/storage/toolbox/syndicate/trapped/New()
..()
new /obj/item/grenade/chem_grenade/explosion/mine_armed(src)
/obj/item/storage/toolbox/drone
name = "mechanical toolbox"
icon_state = "blue"