Merge remote-tracking branch 'origin/master' into TGUI-3.0

This commit is contained in:
Artur
2020-07-02 23:23:47 +03:00
190 changed files with 4635 additions and 3663 deletions
+2 -2
View File
@@ -75,8 +75,8 @@
/datum/wires/explosive/gibtonite
holder_type = /obj/item/twohanded/required/gibtonite
holder_type = /obj/item/gibtonite
/datum/wires/explosive/gibtonite/explode()
var/obj/item/twohanded/required/gibtonite/P = holder
var/obj/item/gibtonite/P = holder
P.GibtoniteReaction(null, 2)