Stationbound Bugfix Bundle (#12025)

This commit is contained in:
Doxxmedearly
2021-06-13 19:53:36 -03:00
committed by GitHub
parent 864484a5a5
commit 7a02fb55c0
5 changed files with 23 additions and 5 deletions
@@ -3,7 +3,10 @@
//Returns the thing in our active hand (whatever is in our active module-slot, in this case)
/mob/living/silicon/robot/get_active_hand()
// TODO: see if refactoring this to return the gripped object (should one exist) works - would make a lot of edge cases a lot simpler
if(istype(module_active, /obj/item/gripper))
var/obj/item/gripper/G = module_active
if(G.wrapped)
return G.wrapped
return module_active
/mob/living/silicon/robot/proc/return_wirecutter()
@@ -391,7 +391,7 @@
custom_name = newname
updatename()
if(module)
if(custom_sprite)
set_module_sprites(module.sprites) // custom synth icons
SSrecords.reset_manifest()
@@ -739,7 +739,7 @@
to_chat(user, SPAN_WARNING("\The [src] does not have a radio installed!"))
return
else if(W.GetID() || istype(W, /obj/item/card/robot)) // trying to unlock the interface with an ID card
if(emagged) //still allow them to open the cover
if(emagged && !is_traitor()) //still allow them to open the cover. is_traitor() dodges this text as being made traitor sets emagged to TRUE.
to_chat(user, SPAN_NOTICE("You notice that \the [src]'s interface appears to be damaged."))
if(opened)
to_chat(user, SPAN_WARNING("You must close the cover to swipe an ID card."))