diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index e07708b93ba..e903356cd02 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -34,7 +34,6 @@ return /obj/machinery/blackbox_recorder/attackby(obj/item/I, mob/living/user, params) - . = ..() if(istype(I, /obj/item/blackbox)) if(HAS_TRAIT(I, TRAIT_NODROP) || !user.transferItemToLoc(I, src)) to_chat(user, "[I] is stuck to your hand!") @@ -44,7 +43,7 @@ playsound(src, 'sound/machines/click.ogg', 50, TRUE) stored = I update_icon() - return ..() + return return ..() /obj/machinery/blackbox_recorder/Destroy() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index a9dd5fd778d..c59972e3c9d 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -92,7 +92,6 @@ /obj/item/radio/intercom/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode) - . = ..() if (message_mode == MODE_INTERCOM) return // Avoid hearing the same thing twice if(!anyai && !(speaker in ai)) diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm index 2627efce051..e04e2bdc422 100644 --- a/code/game/objects/items/devices/reverse_bear_trap.dm +++ b/code/game/objects/items/devices/reverse_bear_trap.dm @@ -76,8 +76,6 @@ "You force open the padlock!", "You hear a single, pronounced click!") REMOVE_TRAIT(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT) struggling = FALSE - else - ..() return ..() diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index b7e90603f2e..b4ef9874a47 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -151,7 +151,6 @@ breakouttime = 1 SECONDS /obj/item/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params) - ..() if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I if (R.use(1)) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 61c727cf7d0..eee48826e86 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -507,12 +507,11 @@ structure_check() searches for nearby cultist structures required for the invoca if(do_after(user, 50, target = src)) //Prevents accidental erasures. log_game("Summon Narsie rune erased by [key_name(user)] with [I.name]") message_admins("[ADMIN_LOOKUPFLW(user)] erased a Narsie rune with [I.name]") - ..() + else if(istype(I, /obj/item/nullrod)) //Begone foul magiks. You cannot hinder me. + log_game("Summon Narsie rune erased by [key_name(user)] using a null rod") + message_admins("[ADMIN_LOOKUPFLW(user)] erased a Narsie rune with a null rod") else - if(istype(I, /obj/item/nullrod)) //Begone foul magiks. You cannot hinder me. - log_game("Summon Narsie rune erased by [key_name(user)] using a null rod") - message_admins("[ADMIN_LOOKUPFLW(user)] erased a Narsie rune with a null rod") - ..() + ..() //Rite of Resurrection: Requires a dead or inactive cultist. When reviving the dead, you can only perform one revival for every three sacrifices your cult has carried out. /obj/effect/rune/raise_dead diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index a589d35b344..28a0da4407c 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -70,7 +70,7 @@ /obj/machinery/computer/libraryconsole/Topic(href, href_list) . = ..() - if(..()) + if(.) usr << browse(null, "window=publiclibrary") onclose(usr, "publiclibrary") return diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index 386fb930a44..d1427da54c6 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -13,7 +13,7 @@ var/obj/item/organ/regenerative_core/C = M if(!istype(C, /obj/item/organ/regenerative_core)) to_chat(user, "The stabilizer only works on certain types of monster organs, generally regenerative in nature.") - return ..() + return C.preserved() to_chat(user, "You inject the [M] with the stabilizer. It will no longer go inert.") diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index df6a887696e..1f460e0a1ae 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -176,7 +176,6 @@ var/hulk_verb = pick("smash","pummel") if(check_shields(user, 15, "the [hulk_verb]ing")) return - ..() playsound(loc, user.dna.species.attack_sound, 25, TRUE, -1) visible_message("[user] [hulk_verb]ed [src]!", \ "[user] [hulk_verb]ed [src]!", "You hear a sickening sound of flesh hitting flesh!", null, user) diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm index 73cf9c62f48..3ec5bddfad5 100644 --- a/code/modules/modular_computers/computers/item/laptop.dm +++ b/code/modules/modular_computers/computers/item/laptop.dm @@ -40,9 +40,8 @@ . = ..() /obj/item/modular_computer/laptop/update_overlays() - . = ..() if(screen_on) - ..() + return ..() else cut_overlays() icon_state = icon_state_closed diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm index 3aa7bef97d3..e112b38f2fd 100644 --- a/code/modules/power/floodlight.dm +++ b/code/modules/power/floodlight.dm @@ -128,7 +128,6 @@ else current-- change_setting(current, user) - ..() /obj/machinery/power/floodlight/obj_break(damage_flag) . = ..() diff --git a/code/modules/power/multiz.dm b/code/modules/power/multiz.dm index 6ad239d3b88..3ad0d8be6df 100644 --- a/code/modules/power/multiz.dm +++ b/code/modules/power/multiz.dm @@ -28,31 +28,29 @@ if(default_unfasten_wrench(user, I)) if(!anchored && broken_status == RELAY_OK) break_connections() - return return FALSE - . = ..() - if(istype(I, /obj/item/stack/cable_coil) && broken_status == RELAY_ADD_CABLE) + + else if(istype(I, /obj/item/stack/cable_coil) && broken_status == RELAY_ADD_CABLE) var/obj/item/stack/C = I if(C.use(15)) to_chat(user, "You fix the frayed wires inside [src].") icon_state = "cablerelay-broken-cable" broken_status = RELAY_ADD_METAL - return else to_chat(user, "You need 15 cables to rewire [src].") - return - if(istype(I, /obj/item/stack/sheet/metal) && broken_status == RELAY_ADD_METAL) + + else if(istype(I, /obj/item/stack/sheet/metal) && broken_status == RELAY_ADD_METAL) var/obj/item/stack/S = I if(S.use(10)) to_chat(user, "You reseal the insulation for [src].") icon_state = "cablerelay" broken_status = RELAY_OK obj_integrity = max_integrity - return else to_chat(user, "You need 10 metal to mend [src].") - return - . = ..() + + else + return ..() /obj/machinery/power/deck_relay/obj_break() ..() diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 3853f076cdb..46b6713bf1b 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -932,7 +932,7 @@ return if(C.max_heat_protection_temperature >= FIRE_IMMUNITY_MAX_TEMP_PROTECT) to_chat(user, "The [C] is already fireproof!") - return ..() + return to_chat(user, "You slather the blue gunk over the [C], fireproofing it.") C.name = "fireproofed [C.name]" C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)