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

2020-05-30 18:52:02 +03:00
parent a6d7a33669 266707b119
commit 19f215477e
361 changed files with 10271 additions and 3115 deletions
@@ -36,6 +36,7 @@
 	targetitem = /obj/item/gun/energy/e_gun/hos
 	difficulty = 10
 	excludefromjob = list("Head Of Security")
+	altitems = list(/obj/item/gun/ballistic/revolver/mws)

 /datum/objective_item/steal/handtele
 	name = "a hand teleporter."
@@ -2,8 +2,7 @@

 GLOBAL_VAR_INIT(hsboxspawn, TRUE)

-/mob
-	var/datum/hSB/sandbox = null
+
 /mob/proc/CanBuild()
 	sandbox = new/datum/hSB
 	sandbox.owner = src.ckey