Merge branch 'Ghommie-cit583' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit583

This commit is contained in:
Ghommie
2020-02-17 00:16:43 +01:00
@@ -39,7 +39,7 @@
/obj/item/implant/hijack/removed(mob/living/source, silent = FALSE, special = 0) /obj/item/implant/hijack/removed(mob/living/source, silent = FALSE, special = 0)
if(..()) if(..())
REMOVE_TRAIT(target, TRAIT_HIJACKER, "implant") REMOVE_TRAIT(source, TRAIT_HIJACKER, "implant")
for (var/area/area in source.siliconaccessareas) for (var/area/area in source.siliconaccessareas)
source.toggleSiliconAccessArea(area) source.toggleSiliconAccessArea(area)
var/obj/machinery/power/apc/apc = area.get_apc() var/obj/machinery/power/apc/apc = area.get_apc()
@@ -118,4 +118,4 @@
imp_in.light_range = 0 imp_in.light_range = 0
imp_in.light_color = COLOR_YELLOW imp_in.light_color = COLOR_YELLOW
imp_in.update_light() imp_in.update_light()
return TRUE return TRUE