diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index f9293991c43..bd6e08c0180 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -482,7 +482,7 @@
to_chat(M, "That object is useless to you.")
return
-/mob/living/handle_basic_attack(mob/living/basic/attacker, modifiers)
+/obj/machinery/porta_turret/handle_basic_attack(mob/living/basic/attacker, modifiers)
attacker.changeNext_move(CLICK_CD_MELEE)
attacker.do_attack_animation(src)
if(attacker.melee_damage_upper == 0 || (attacker.melee_damage_type != BRUTE && attacker.melee_damage_type != BURN))
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 2f841c043d5..f368aeb144f 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -606,7 +606,8 @@
update_icon(UPDATE_ICON_STATE | UPDATE_OVERLAYS)
update_lighting()
-/obj/machinery/teleport/perma/initialize_parts()
+/obj/machinery/teleport/perma/preset/initialize_parts()
+ . = ..()
tele_delay = 0 // Act like a fully upgraded tele, no T4 stock parts to plunder.
/obj/machinery/teleport/perma/preset/cerestation
diff --git a/code/game/turfs/space/space_turf.dm b/code/game/turfs/space/space_turf.dm
index 751bea457dc..ee7d3f679cd 100644
--- a/code/game/turfs/space/space_turf.dm
+++ b/code/game/turfs/space/space_turf.dm
@@ -49,14 +49,14 @@
return INITIALIZE_HINT_NORMAL
-/turf/BeforeChange()
+/turf/space/BeforeChange()
..()
var/datum/space_level/S = GLOB.space_manager.get_zlev(z)
S.remove_from_transit(src)
if(light_sources) // Turn off starlight, if present
set_light(0)
-/turf/AfterChange(ignore_air, keep_cabling = FALSE)
+/turf/space/AfterChange(ignore_air, keep_cabling = FALSE)
..()
var/datum/space_level/S = GLOB.space_manager.get_zlev(z)
S.add_to_transit(src)
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index 8d50cb011a0..f7bdb28d4f0 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -5,6 +5,7 @@
. = ..()
// We don't want people building rods in space.
RegisterSignal(src, COMSIG_ATTACK_BY, TYPE_PROC_REF(/datum, signal_cancel_attack_by))
+ update_icon(UPDATE_ICON_STATE)
/// moving to the north
/turf/space/transit/north
@@ -61,10 +62,6 @@
/turf/space/transit/rpd_act()
return
-/turf/space/transit/Initialize(mapload)
- . = ..()
- update_icon(UPDATE_ICON_STATE)
-
/turf/space/transit/update_icon_state()
var/p = 9
var/angle = 0
diff --git a/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm b/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm
index 8581222b518..9d5e38cb0d0 100644
--- a/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm
+++ b/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm
@@ -5,6 +5,6 @@
/obj/structure/closet/wardrobe/atmospherics_yellow/empty
-/obj/structure/closet/wardrobe/atmospherics_yellow/populate_contents()
+/obj/structure/closet/wardrobe/atmospherics_yellow/empty/populate_contents()
return
diff --git a/code/modules/events/blob/theblob.dm b/code/modules/events/blob/theblob.dm
index dd789342f12..ba06e8d9135 100644
--- a/code/modules/events/blob/theblob.dm
+++ b/code/modules/events/blob/theblob.dm
@@ -31,6 +31,10 @@ GLOBAL_LIST_EMPTY(blob_minions)
if(atmosblock)
recalculate_atmos_connectivity()
ConsumeTile()
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(on_atom_entered)
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
/obj/structure/blob/Destroy()
if(atmosblock)
@@ -199,13 +203,6 @@ GLOBAL_LIST_EMPTY(blob_minions)
color = incoming_overmind.blob_reagent_datum.color
return
-/obj/structure/blob/Initialize(mapload)
- . = ..()
- var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = PROC_REF(on_atom_entered)
- )
- AddElement(/datum/element/connect_loc, loc_connections)
-
/obj/structure/blob/proc/on_atom_entered(datum/source, atom/movable/entered)
entered.blob_act(src)
diff --git a/code/modules/mob/living/simple_animal/slime/slime_death.dm b/code/modules/mob/living/simple_animal/slime/slime_death.dm
index fcd7eb8d2b4..d468adab38d 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_death.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_death.dm
@@ -28,6 +28,9 @@
set_stat(DEAD) //Temporarily set to dead for icon updates
regenerate_icons()
set_stat(CONSCIOUS)
+ if(holding_organ)
+ eject_organ()
+ underlays.Cut()
return ..(gibbed)
diff --git a/code/modules/mob/living/simple_animal/slime/slime_mob.dm b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
index bee8406c789..249dc400e8b 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_mob.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
@@ -117,12 +117,6 @@
Target = null
return ..()
-/mob/living/simple_animal/slime/death()
- if(holding_organ)
- eject_organ()
- underlays.Cut()
- return ..()
-
/mob/living/simple_animal/slime/update_overlays()
. = ..()
if(stat != DEAD)
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 31c5ed258bc..af72b949700 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -857,11 +857,6 @@
for(var/obj/item/mod/module/module as anything in modules)
module.extinguish_light(force)
-/obj/item/mod/control/hear_talk(mob/living/user, list/message_pieces)
- if(bag)
- for(var/obj/object in bag)
- object.hear_talk(user, message_pieces)
-
/obj/item/mod/control/hear_message(mob/living/user, msg)
if(bag)
for(var/obj/object in bag)
diff --git a/code/modules/mod/mod_link.dm b/code/modules/mod/mod_link.dm
index 76888457a6a..4d7868d92d1 100644
--- a/code/modules/mod/mod_link.dm
+++ b/code/modules/mod/mod_link.dm
@@ -102,6 +102,10 @@
/obj/item/mod/control/hear_talk(mob/living/M, list/message_pieces)
. = ..()
+ if(bag)
+ for(var/obj/object in bag)
+ object.hear_talk(M, message_pieces)
+
if(M != wearer || !mod_link.visual)
return
if(ishuman(M))
diff --git a/code/modules/power/lights.dm b/code/modules/power/lights.dm
index 36ce66726e6..24c82627b71 100644
--- a/code/modules/power/lights.dm
+++ b/code/modules/power/lights.dm
@@ -457,7 +457,7 @@
else
underlays += emissive_appearance(icon, "[base_state]_lightmask")
-/obj/machinery/light/fix(mob/user, obj/used_tool, emagged = FALSE)
+/obj/machinery/light/proc/fix(mob/user, obj/used_tool, emagged = FALSE)
if(status != LIGHT_OK)
to_chat(user, "You replace the [fitting] with [used_tool].")
status = LIGHT_OK
@@ -585,6 +585,12 @@
// attack with item - insert light (if right type), otherwise try to break the light
/obj/machinery/light/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+ if(status == LIGHT_BROKEN || status == LIGHT_EMPTY)
+ if(on && (used.flags & CONDUCT))
+ if(prob(12))
+ electrocute_mob(user, get_area(src), src, 0.3, TRUE)
+ return ITEM_INTERACT_COMPLETE
+
var/obj/item/gripper/gripper = used
if(istype(gripper) && gripper.engineering_machine_interaction)
if(gripper.gripped_item)
@@ -715,15 +721,6 @@
transfer_fingerprints_to(newlight)
qdel(src)
-/obj/machinery/light/item_interaction(mob/living/user, obj/item/used, list/modifiers)
- if(status == LIGHT_BROKEN || status == LIGHT_EMPTY)
- if(on && (used.flags & CONDUCT))
- if(prob(12))
- electrocute_mob(user, get_area(src), src, 0.3, TRUE)
- return ITEM_INTERACT_COMPLETE
-
- return ..()
-
/obj/machinery/light/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
. = ..()
if(. && !QDELETED(src))
@@ -914,14 +911,6 @@
status = LIGHT_BROKEN
update()
-/obj/machinery/light/proc/fix()
- if(status == LIGHT_OK)
- return
- status = LIGHT_OK
- extinguished = FALSE
- on = TRUE
- update(FALSE, TRUE, FALSE)
-
/obj/machinery/light/zap_act(power, zap_flags)
var/explosive = zap_flags & ZAP_MACHINE_EXPLOSIVE
zap_flags &= ~(ZAP_MACHINE_EXPLOSIVE | ZAP_OBJ_DAMAGE)
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 4c4643907d6..796d270ab5c 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -440,7 +440,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands())
trigger = "run"
is_regex = FALSE
-/datum/voice_of_god_command/walk/execute(list/listeners, mob/living/user, power_multiplier = 1, message)
+/datum/voice_of_god_command/run/execute(list/listeners, mob/living/user, power_multiplier = 1, message)
for(var/mob/living/target as anything in listeners)
if(target.m_intent != MOVE_INTENT_RUN)
target.m_intent = MOVE_INTENT_RUN
@@ -459,7 +459,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands())
trigger = "help|pacify"
cooldown = COOLDOWN_DAMAGE
-/datum/voice_of_god_command/throw_catch/execute(list/listeners, mob/living/user, power_multiplier = 1, message)
+/datum/voice_of_god_command/help/execute(list/listeners, mob/living/user, power_multiplier = 1, message)
for(var/mob/living/carbon/human/H in listeners)
H.apply_status_effect(STATUS_EFFECT_PACIFIED, 10 SECONDS * power_multiplier)