diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 9292e1ce93..4c32fda5f2 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -78,7 +78,12 @@ uses -= used_uses A.add_fingerprint(user) - log_and_message_admins("emagged \an [A].") + //Vorestation Edit: Because some things (read lift doors) don't get emagged + if(used_uses) + log_and_message_admins("emagged \an [A].") + else + log_and_message_admins("attempted to emag \an [A].") + // Vorestation Edit: End of Edit if(uses<1) user.visible_message("\The [src] fizzles and sparks - it seems it's been used once too often, and is now spent.") diff --git a/code/modules/turbolift/turbolift_door_vr.dm b/code/modules/turbolift/turbolift_door_vr.dm new file mode 100644 index 0000000000..299140c4a2 --- /dev/null +++ b/code/modules/turbolift/turbolift_door_vr.dm @@ -0,0 +1,5 @@ +// Vore specific code for /obj/machinery/door/airlock/lift + +/obj/machinery/door/airlock/lift/emag_act(var/uses_left, var/mob/user) + user << "This door is internally controlled." + return 0 // Prevents the cryptographic sequencer from using a charge fruitlessly diff --git a/vorestation.dme b/vorestation.dme index 1937623977..6dde0c3cb6 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2410,6 +2410,7 @@ #include "code\modules\turbolift\turbolift_areas.dm" #include "code\modules\turbolift\turbolift_console.dm" #include "code\modules\turbolift\turbolift_door.dm" +#include "code\modules\turbolift\turbolift_door_vr.dm" #include "code\modules\turbolift\turbolift_floor.dm" #include "code\modules\turbolift\turbolift_map.dm" #include "code\modules\turbolift\turbolift_process.dm"