Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456

[MIRROR] [s] Fixes altclick exploits
This commit is contained in:
CitadelStationBot
2018-02-11 09:43:09 -06:00
committed by GitHub
60 changed files with 653 additions and 672 deletions
@@ -24,7 +24,7 @@
armor = list(melee = 50, bullet = 70, laser = 70, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 0, acid = 0)
/obj/item/device/electronic_assembly/proc/check_interactivity(mob/user)
return user.canUseTopic(src,be_close = TRUE)
return user.canUseTopic(src, BE_CLOSE)
/obj/item/device/electronic_assembly/Initialize()
@@ -68,7 +68,7 @@ a creative player the means to solve many problems. Circuits are held inside an
if(assembly)
return assembly.check_interactivity(user)
else
return user.canUseTopic(src,be_close = TRUE)
return user.canUseTopic(src, BE_CLOSE)
/obj/item/integrated_circuit/Initialize()
displayed_name = name
@@ -10,7 +10,7 @@
var/list/program // Currently loaded save, in form of list
/obj/item/device/integrated_circuit_printer/proc/check_interactivity(mob/user)
return user.canUseTopic(src, be_close = TRUE)
return user.canUseTopic(src, BE_CLOSE)
/obj/item/device/integrated_circuit_printer/upgraded
upgraded = TRUE