diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index b7d961cc35d..5406743f015 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -111,13 +111,10 @@ Class Procs: var/power_channel = EQUIP //EQUIP,ENVIRON or LIGHT var/list/component_parts = null //list of all the parts used to build it, if made from certain kinds of frames. var/uid - var/manual = 0 var/global/gl_uid = 1 - var/custom_aghost_alerts=0 var/panel_open = 0 var/area/myArea var/interact_offline = 0 // Can the machine be interacted with while de-powered. - var/list/use_log // Init this list if you wish to add logging to your machine - currently only viewable in VV var/list/settagwhitelist // (Init this list if needed) WHITELIST OF VARIABLES THAT THE set_tag HREF CAN MODIFY, DON'T PUT SHIT YOU DON'T NEED ON HERE, AND IF YOU'RE GONNA USE set_tag (format_tag() proc), ADD TO THIS LIST. atom_say_verb = "beeps" var/siemens_strength = 0.7 // how badly will it shock you? diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 840323a4071..f15cbb793e2 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -70,7 +70,6 @@ var/overeatduration = 0 // How long this guy is overeating //Carbon var/intent = null //Living - var/shakecamera = 0 var/a_intent = INTENT_HELP //Living var/m_intent = MOVE_INTENT_RUN //Living var/lastKnownIP = null @@ -136,9 +135,6 @@ var/list/mob_spell_list = list() //construct spells and mime spells. Spells that do not transfer from one mob to another and can not be lost in mindswap. -//Changlings, but can be used in other modes -// var/obj/effect/proc_holder/changpower/list/power_list = list() - //List of active diseases var/list/viruses = list() // list of all diseases in a mob diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 521439c4cb6..b21658699c5 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -311,26 +311,22 @@ S.message = muffledspeech(S.message) -/proc/shake_camera(mob/M, duration, strength=1) - if(!M || !M.client || M.shakecamera) +///Shake the camera of the person viewing the mob SO REAL! +/proc/shake_camera(mob/M, duration, strength = 1) + if(!M || !M.client || duration < 1) return - M.shakecamera = 1 - spawn(1) + var/client/C = M.client + var/oldx = C.pixel_x + var/oldy = C.pixel_y + var/max = strength * world.icon_size + var/min = -(strength * world.icon_size) - var/atom/oldeye=M.client.eye - var/aiEyeFlag = 0 - if(istype(oldeye, /mob/camera/aiEye)) - aiEyeFlag = 1 - - var/x - for(x=0; xJMP)",0,1) log_game("PA Control Computer increased to [strength] by [key_name(usr)] in ([x],[y],[z])") investigate_log("increased to [strength] by [key_name(usr)]","singulo") - use_log += text("\[[time_stamp()]\] [usr.name] ([key_name(usr)]) has increased the PA Control Computer to [strength].") investigate_log("increased to [strength] by [usr.key]","singulo") strength_change() @@ -146,7 +144,6 @@ message_admins("PA Control Computer decreased to [strength] by [key_name_admin(usr)] in ([x],[y],[z] - JMP)",0,1) log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in ([x],[y],[z])") investigate_log("decreased to [strength] by [key_name(usr)]","singulo") - use_log += text("\[[time_stamp()]\] [usr.name] ([key_name(usr)]) has decreased the PA Control Computer to [strength].") strength_change() @@ -237,7 +234,6 @@ msg_admin_attack("PA Control Computer turned ON by [key_name_admin(usr)]", ATKLOG_FEW) usr.create_log(MISC_LOG, "PA Control Computer turned ON", src) log_game("PA Control Computer turned ON by [key_name(usr)] in ([x],[y],[z])") - use_log += text("\[[time_stamp()]\] [key_name(usr)] has turned on the PA Control Computer.") if(active) use_power = ACTIVE_POWER_USE for(var/obj/structure/particle_accelerator/part in connected_parts)