From a188a6b89058275f764580efb55c70a20b0d92ab Mon Sep 17 00:00:00 2001 From: Couls Date: Tue, 23 Apr 2019 05:56:12 -0400 Subject: [PATCH] change some move procs --- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/objects/structures/target_stake.dm | 2 +- code/game/objects/structures/windoor_assembly.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/modules/assembly/holder.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/keybindings/setup.dm | 2 ++ code/modules/mob/dead/dead.dm | 2 ++ code/modules/mob/mob.dm | 1 + code/modules/power/gravitygenerator.dm | 2 +- .../singularity/particle_accelerator/particle_accelerator.dm | 2 +- 11 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 5e6e72929fe..3d169a775ff 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -35,7 +35,7 @@ /obj/structure/mineral_door/Move() var/turf/T = loc - ..() + . = ..() move_update_air(T) /obj/structure/mineral_door/Bumped(atom/user) diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index a51f58e5ec6..591157e8bd6 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -13,7 +13,7 @@ return ..() /obj/structure/target_stake/Move() - ..() + . = ..() // Move the pinned target along with the stake if(pinned_target in view(3, src)) pinned_target.loc = loc diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index acacb4e9153..1124745d8b3 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -46,7 +46,7 @@ obj/structure/windoor_assembly/Destroy() /obj/structure/windoor_assembly/Move() var/turf/T = loc - ..() + . = ..() setDir(ini_dir) move_update_air(T) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index ad655a39b64..125fefb7a81 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -431,7 +431,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f /obj/structure/window/Move() var/turf/T = loc - ..() + . = ..() setDir(ini_dir) move_update_air(T) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 0d5a866e6c5..f2fde8df758 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -116,7 +116,7 @@ a_right.holder_movement() /obj/item/assembly_holder/Move() - ..() + . = ..() process_movement() return diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 91f8da7cc4b..d47e89a128a 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -106,7 +106,7 @@ /obj/item/assembly/infra/Move() var/t = dir - ..() + . = ..() dir = t qdel(first) diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index 270895826c9..8144be3f962 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -8,8 +8,10 @@ // Set a client's focus to an object and override these procs on that object to let it handle keypresses /datum/proc/key_down(key, client/user) // Called when a key is pressed down initially + to_chat(src,"key pressed:", key) return /datum/proc/key_up(key, client/user) // Called when a key is released + to_chat(src,"key released:", key) return /datum/proc/keyLoop(client/user) // Called once every frame set waitfor = FALSE diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index 5f7d140b174..d8074424b28 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -20,3 +20,5 @@ for(var/datum/light_source/L in light_sources) L.source_atom.update_light() return 1 +/mob/dead/Initialize() + set_focus(src) \ No newline at end of file diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index b5ef2f55cf2..bb7cbde6e91 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -2,6 +2,7 @@ GLOB.mob_list -= src GLOB.dead_mob_list -= src GLOB.living_mob_list -= src + focus = null QDEL_NULL(hud_used) if(mind && mind.current == src) spellremove(src) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 3a453ffe10c..33b632df413 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -46,7 +46,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 // You aren't allowed to move. /obj/machinery/gravity_generator/Move() - ..() + . = ..() qdel(src) /obj/machinery/gravity_generator/proc/set_broken() diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index c6c6de434c2..62d52c587c9 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -144,7 +144,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin /obj/structure/particle_accelerator/Move() - ..() + . = ..() if(master && master.active) master.toggle_power() investigate_log("was moved whilst active; it powered down.","singulo")