diff --git a/code/_onclick/observer_onclick.dm b/code/_onclick/observer_onclick.dm index 44ead52d45b..1b3955b5de9 100644 --- a/code/_onclick/observer_onclick.dm +++ b/code/_onclick/observer_onclick.dm @@ -107,7 +107,3 @@ var/obj/machinery/computer/teleporter/com = S.teleporter_console if(com && com.target) user.forceMove(get_turf(com.target)) - -/obj/effect/portal/attack_ghost(mob/user as mob) - if(target) - user.forceMove(get_turf(target)) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index a7d7fb33062..28021303618 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -42,6 +42,16 @@ /client/vv_edit_var(var_name, var_value) //called whenever a var is edited switch(var_name) + // I know we will never be in a world where admins are editing client vars to let people bypass TOS + // But guess what, if I have the ability to overengineer something, I am going to do it + if("tos_consent") + return FALSE + // Dont fuck with this + if("cui_entries") + return FALSE + // or this + if("jbh") + return FALSE if("vars") return FALSE if("var_edited") diff --git a/code/datums/diseases/advance/symptoms/viral.dm b/code/datums/diseases/advance/symptoms/viral.dm index 8ac3723c55b..1614d092fc3 100644 --- a/code/datums/diseases/advance/symptoms/viral.dm +++ b/code/datums/diseases/advance/symptoms/viral.dm @@ -54,7 +54,7 @@ BONUS transmittable = 3 level = 3 -/datum/symptom/viraladaptation/Activate(datum/disease/advance/A) +/datum/symptom/viralevolution/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/spell.dm b/code/datums/spell.dm index c510c180ed1..3c226aa476c 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -20,6 +20,8 @@ GLOBAL_LIST_INIT(spells, typesof(/datum/spell)) user.ranged_ability.remove_ranged_ability(user) return TRUE //TRUE for failed, FALSE for passed. user.face_atom(A) + if(targeting) + targeting.InterceptClickOn(user, params, A, src) return FALSE /datum/spell/proc/add_ranged_ability(mob/user, msg) @@ -269,13 +271,6 @@ GLOBAL_LIST_INIT(spells, typesof(/datum/spell)) /datum/spell/proc/AltClick(mob/user) return Click() -/datum/spell/InterceptClickOn(mob/user, params, atom/A) - . = ..() - if(.) - return - if(targeting) - targeting.InterceptClickOn(user, params, A, src) - ///Lets the spell have a special effect applied to it when upgraded. By default, does nothing. /datum/spell/proc/on_purchase_upgrade() return diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 7956659b46f..fbf492896f7 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1176,7 +1176,6 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) if("color") add_atom_colour(color, ADMIN_COLOUR_PRIORITY) - /atom/vv_get_dropdown() . = ..() .["Manipulate Colour Matrix"] = "?_src_=vars;manipcolours=[UID()]" diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 49b3b9a4f81..bcdcde39a4c 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -104,6 +104,13 @@ if(pulledby) pulledby.stop_pulling() + var/turf/T = loc + if(opacity && istype(T)) + var/old_has_opaque_atom = T.has_opaque_atom + T.recalc_atom_opacity() + if(old_has_opaque_atom != T.has_opaque_atom) + T.reconsider_lights() + //Returns an atom's power cell, if it has one. Overload for individual items. /atom/movable/proc/get_cell() return diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index ad447d9d56d..cea64402280 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -111,8 +111,8 @@ return FALSE /obj/machinery/dna_scannernew/relaymove(mob/user) - if(user.stat) - return + if(user.incapacitated()) + return FALSE //maybe they should be able to get out with cuffs, but whatever go_out() /obj/machinery/dna_scannernew/AltClick(mob/user) @@ -247,11 +247,6 @@ if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", I)) return TRUE -/obj/machinery/dna_scannernew/relaymove(mob/user) - if(user.incapacitated()) - return FALSE //maybe they should be able to get out with cuffs, but whatever - go_out() - /obj/machinery/dna_scannernew/proc/put_in(mob/M) M.forceMove(src) occupant = M diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index 6ea8194fe61..3ccb08f7b93 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -4,7 +4,7 @@ required_players = 0 single_antag_positions = list() -/datum/game_mode/announce() +/datum/game_mode/extended/announce() to_chat(world, "The current game mode is - Extended Role-Playing!") to_chat(world, "Just have fun and role-play!") diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 0292df084c5..08f8b073b7a 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -138,9 +138,6 @@ /obj/effect/rend/singularity_pull() return -/obj/effect/rend/singularity_pull() - return - /obj/item/veilrender/vealrender name = "veal render" desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast farm." diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 3ff78acca01..e460bedd1f7 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -455,8 +455,6 @@ uniform = /obj/item/clothing/under/rank/civilian/mime/sexy suit = /obj/item/clothing/mask/gas/sexymime -/datum/outfit/job/mime/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() if(visualsOnly) return diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index e2ffc3605b4..e5f1aeaed1d 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -42,11 +42,6 @@ add_fingerprint(user) ui_interact(user) -/obj/machinery/computer/prisoner/attackby(obj/item/O, mob/user) - if(ui_login_attackby(O, user)) - return - return ..() - /obj/machinery/computer/prisoner/proc/check_implant(obj/item/bio_chip/I) var/turf/implant_location = get_turf(I) if(!implant_location || implant_location.z != z) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 090765d4845..1192eaf6ed1 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -203,9 +203,6 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) return ..(user) -/obj/machinery/door/airlock/bumpopen(mob/living/simple_animal/user) - ..(user) - /obj/machinery/door/airlock/proc/isElectrified() if(electrified_until != 0) return 1 diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 9af68c60df5..9a815f019b3 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -38,10 +38,20 @@ var/prisoner_time var/prisoner_hasrecord = FALSE +/obj/machinery/door_timer/Initialize(mapload) + ..() + + GLOB.celltimers_list += src + Radio = new /obj/item/radio(src) + Radio.listening = FALSE + Radio.config(list("Security" = 0)) + Radio.follow_target = src + return INITIALIZE_HINT_LATELOAD + /obj/machinery/door_timer/Destroy() + QDEL_NULL(Radio) targets.Cut() prisoner = null - qdel(Radio) GLOB.celltimers_list -= src return ..() @@ -113,16 +123,6 @@ return atom_say("[src] beeps, \"[occupant]: [notifytext]\"") -/obj/machinery/door_timer/Initialize(mapload) - ..() - - GLOB.celltimers_list += src - Radio = new /obj/item/radio(src) - Radio.listening = FALSE - Radio.config(list("Security" = 0)) - Radio.follow_target = src - return INITIALIZE_HINT_LATELOAD - /obj/machinery/door_timer/LateInitialize() ..() for(var/obj/machinery/door/window/brigdoor/M in GLOB.airlocks) @@ -149,12 +149,6 @@ stat |= BROKEN update_icon(UPDATE_ICON_STATE) -/obj/machinery/door_timer/Destroy() - QDEL_NULL(Radio) - targets.Cut() - prisoner = null - return ..() - /obj/machinery/door_timer/proc/on_target_qdel(atom/target) targets -= target diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index a07d1427dfd..8551084a26f 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -140,11 +140,6 @@ /obj/machinery/door/CanAtmosPass(direction) return !density -/obj/machinery/door/get_superconductivity(direction) - if(density) - return superconductivity - return ..() - /obj/machinery/door/proc/bumpopen(mob/user) if(operating) return diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index c805da7586d..788df39c50d 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -47,8 +47,17 @@ new /obj/item/stack/sheet/animalhide/armor_plate(get_turf(src)) for(var/i in 1 to drake_hides) new /obj/item/stack/sheet/animalhide/ashdrake(get_turf(src)) + for(var/mob/M in src) + if(M == occupant) + continue + M.loc = get_turf(src) + M.loc.Entered(M) + step_rand(M) for(var/atom/movable/A in cargo) - A.forceMove(get_turf(src)) + A.loc = get_turf(src) + var/turf/T = get_turf(A) + if(T) + T.Entered(A) step_rand(A) cargo.Cut() return ..() @@ -236,8 +245,6 @@ log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - length(cargo)]") return - - /obj/mecha/working/ripley/get_stats_part() var/output = ..() output += "Cargo Compartment Contents:
" @@ -249,21 +256,6 @@ output += "
" return output -/obj/mecha/working/ripley/Destroy() - for(var/mob/M in src) - if(M == occupant) - continue - M.loc = get_turf(src) - M.loc.Entered(M) - step_rand(M) - for(var/atom/movable/A in cargo) - A.loc = get_turf(src) - var/turf/T = get_turf(A) - if(T) - T.Entered(A) - step_rand(A) - return ..() - /obj/mecha/working/ripley/ex_act(severity) ..() for(var/X in cargo) diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index 401709a8154..373504a9235 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -18,9 +18,6 @@ /obj/effect/decal/cleanable/blood/gibs/robot/dry() //pieces of robots do not dry up like return -/obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in() - return FALSE - /obj/effect/decal/cleanable/blood/gibs/robot/streak(list/directions) spawn(0) var/direction = pick(directions) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index ea9539bd222..6c815fb7bb8 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( if(!G && !RG && replace) user.put_in_hands(RG) return - + return ..() ////////////////////////////// diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 8cf42add853..ea09eae34d7 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -568,6 +568,7 @@ GLOBAL_LIST_INIT(cult_recipes, list ( . = ..() icon_state = GET_CULT_DATA(runed_metal_icon_state, initial(icon_state)) item_state = GET_CULT_DATA(runed_metal_item_state, initial(item_state)) + recipes = GLOB.cult_recipes /obj/item/stack/sheet/runed_metal/attack_self(mob/living/user) if(!IS_CULTIST(user)) @@ -597,10 +598,6 @@ GLOBAL_LIST_INIT(cult_recipes, list ( /obj/item/stack/sheet/runed_metal/fifty amount = 50 -/obj/item/stack/sheet/runed_metal/New(loc, amount=null) - recipes = GLOB.cult_recipes - return ..() - ////////////////////////////// // MARK: BRASS ////////////////////////////// diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index f37f7a52c39..4581d89b6eb 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -53,7 +53,7 @@ var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "[(I - 1)]donut[donut.donut_sprite_type]") . += new_donut_icon -/obj/item/storage/fancy/update_icon_state() +/obj/item/storage/fancy/donut_box/update_icon_state() return /obj/item/storage/fancy/donut_box/populate_contents() @@ -96,13 +96,15 @@ name = "Candle pack" desc = "A pack of red candles." icon = 'icons/obj/candle.dmi' - icon_state = "candlebox5" + icon_state = "candlebox0" icon_type = "candle" item_state = "candlebox5" storage_slots = 5 throwforce = 2 slot_flags = SLOT_FLAG_BELT +/obj/item/storage/fancy/candle_box/full + icon_state = "candlebox5" /obj/item/storage/fancy/candle_box/full/populate_contents() for(var/I in 1 to storage_slots) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 86685a83197..2fd912cf450 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -23,6 +23,8 @@ noz = make_noz() /obj/item/watertank/Destroy() + if(on) + remove_noz() QDEL_NULL(noz) return ..() @@ -69,12 +71,6 @@ M.unEquip(noz, 1) return -/obj/item/watertank/Destroy() - if(on) - remove_noz() - QDEL_NULL(noz) - return ..() - /obj/item/watertank/attack_hand(mob/user) if(loc == user) toggle_mister(user) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 9d177ce3576..d2c956ece58 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -82,10 +82,6 @@ /obj/structure/closet/statue/open() return -/obj/structure/closet/statue/open() - return - - /obj/structure/closet/statue/close() return diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 47e9c6ffdfd..effa8969f1c 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -36,9 +36,6 @@ /obj/structure/flora/tree/dead/Initialize(mapload) . = ..() AddComponent(/datum/component/largetransparency, 0, 1, 0, 0) - -/obj/structure/flora/tree/dead/Initialize(mapload) - . = ..() icon_state = "tree_[rand(1, 6)]" /obj/structure/flora/tree/palm diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index f32aa68482e..210dbed1bb9 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -25,7 +25,10 @@ . = ..() . += "A powered wire underneath this will cause the grille to shock anyone who touches the grill. An electric shock may leap forth if the grill is damaged." . += "Use wirecutters to deconstruct this item." - + if(anchored) + . += "It's secured in place with screws. The rods look like they could be cut through." + else + . += "The anchoring screws are unscrewed. The rods look like they could be cut through." /obj/structure/grille/fence var/width = 3 @@ -64,13 +67,6 @@ return icon_state = "grille50_[rand(0,3)]" -/obj/structure/grille/examine(mob/user) - . = ..() - if(anchored) - . += "It's secured in place with screws. The rods look like they could be cut through." - if(!anchored) - . += "The anchoring screws are unscrewed. The rods look like they could be cut through." - /obj/structure/grille/Bumped(atom/user) if(ismob(user)) if(!(shockcooldown <= world.time)) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 82218998c4d..bebc1428a25 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -24,9 +24,6 @@ /obj/structure/lattice/examine(mob/user) . = ..() . += deconstruction_hints(user) - -/obj/structure/lattice/examine(mob/user) - . = ..() . += "Add a floor tile to build a floor on top of the lattice." /obj/structure/lattice/proc/deconstruction_hints(mob/user) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 45809087903..cebaa4e5dc0 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -79,7 +79,7 @@ to_chat(user, "You uninstall [src].") qdel(src) -/obj/structure/transit_tube/wrench_act(mob/living/user, obj/item/I) +/obj/structure/transit_tube_pod/wrench_act(mob/living/user, obj/item/I) . = TRUE to_chat(user, "You must uninstall [src] before disassembling it!") diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 88037967d20..0dbe2dc77e3 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -140,7 +140,7 @@ /turf/simulated/floor/noslip/get_broken_states() return list("noslip-damaged1", "noslip-damaged2", "noslip-damaged3") -/turf/simulated/floor/plating/asteroid/snow/get_burnt_states() +/turf/simulated/floor/noslip/get_burnt_states() return list("noslip-scorched1", "noslip-scorched2") /turf/simulated/floor/noslip/MakeSlippery() diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index cfdbe60c94d..e2f7bc5e67a 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -146,10 +146,6 @@ /turf/space/transit/rpd_act() return -//Overwrite because we dont want people building rods in space. -/turf/space/transit/attackby() - return - /turf/space/transit/Initialize(mapload) . = ..() update_icon(UPDATE_ICON_STATE) diff --git a/code/modules/assembly/assembly_holder.dm b/code/modules/assembly/assembly_holder.dm index 02a526da94e..2b6db007441 100644 --- a/code/modules/assembly/assembly_holder.dm +++ b/code/modules/assembly/assembly_holder.dm @@ -13,12 +13,6 @@ var/obj/item/assembly/a_left = null var/obj/item/assembly/a_right = null -/obj/item/assembly_holder/proc/attach(obj/item/D, obj/item/D2, mob/user) - return - -/obj/item/assembly_holder/proc/process_activation(obj/item/D) - return - /obj/item/assembly_holder/IsAssemblyHolder() return TRUE @@ -29,7 +23,7 @@ a_right.holder = null return ..() -/obj/item/assembly_holder/attach(obj/item/D, obj/item/D2, mob/user) +/obj/item/assembly_holder/proc/attach(obj/item/D, obj/item/D2, mob/user) if(!D || !D2) return FALSE if(!isassembly(D) || !isassembly(D2)) @@ -191,7 +185,7 @@ qdel(src) -/obj/item/assembly_holder/process_activation(obj/D, normal = TRUE, special = TRUE) +/obj/item/assembly_holder/proc/process_activation(obj/D, normal = TRUE, special = TRUE) if(!D) return FALSE if(normal && a_right && a_left) diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index 6d128f01ce6..32e0ae23cbb 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -59,10 +59,6 @@ ..() ADD_TRAIT(user, TRAIT_CAN_VIEW_HEALTH, "HEALTH[UID()]") -/obj/item/gps/dropped(mob/user, silent) - REMOVE_TRAIT(user, TRAIT_CAN_VIEW_HEALTH, "HEALTH[UID()]") - return ..() - /obj/item/assembly/health/proc/toggle_scan() if(!secured) return FALSE diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index ce0a1ed401e..1381017f1c2 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -216,6 +216,9 @@ if(!building) first_run() + if(!master_is_operating()) + elect_master() + /obj/machinery/alarm/Destroy() SStgui.close_uis(wires) GLOB.air_alarms -= src @@ -231,11 +234,6 @@ apply_preset(AALARM_PRESET_HUMAN) // Don't cycle. GLOB.air_alarm_repository.update_cache(src) -/obj/machinery/alarm/Initialize(mapload) - . = ..() - if(!master_is_operating()) - elect_master() - /obj/machinery/alarm/proc/master_is_operating() if(!alarm_area) alarm_area = get_area(src) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index 8ec612546e9..8f0b25cbb2e 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -13,7 +13,7 @@ var/id = null -/obj/machinery/atmospherics/binary/volume_pump/can_be_pulled(user, grab_state, force, show_message) +/obj/machinery/atmospherics/binary/passive_gate/can_be_pulled(user, grab_state, force, show_message) return FALSE /obj/machinery/atmospherics/binary/passive_gate/CtrlClick(mob/living/user) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index daa791d502c..1690df3deff 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -15,9 +15,6 @@ /obj/machinery/atmospherics/binary/valve/examine(mob/user) . = ..() . += "It is currently [open ? "open" : "closed"]." - -/obj/machinery/atmospherics/binary/valve/examine(mob/user) - . = ..() . += "Click this to turn the valve. If red, the pipes on each end are separated. Otherwise, they are connected." /obj/machinery/atmospherics/binary/valve/open diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 22893029b46..627f04e8a14 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -43,6 +43,10 @@ /obj/machinery/atmospherics/unary/thermomachine/examine(mob/user) . = ..() . += "Cools or heats the gas of the connected pipenet, uses a large amount of electricity while activated." + . += "The thermostat is set to [target_temperature]K ([(T0C - target_temperature) * -1]C)." + if(in_range(user, src) || isobserver(user)) + . += "The status display reads: Efficiency [(heat_capacity / 5000) * 100]%." + . += "Temperature range [min_temperature]K - [max_temperature]K ([(T0C - min_temperature) * -1]C - [(T0C-max_temperature) * -1]C)." /obj/machinery/atmospherics/unary/thermomachine/proc/swap_function() cooling = !cooling @@ -84,14 +88,6 @@ else icon_state = icon_state_off -/obj/machinery/atmospherics/unary/thermomachine/examine(mob/user) - . = ..() - . += "The thermostat is set to [target_temperature]K ([(T0C - target_temperature) * -1]C)." - if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Efficiency [(heat_capacity / 5000) * 100]%." - . += "Temperature range [min_temperature]K - [max_temperature]K ([(T0C - min_temperature) * -1]C - [(T0C-max_temperature) * -1]C)." - - /obj/machinery/atmospherics/unary/thermomachine/process_atmos() if(!on) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 2050b13f581..bc4eba9414c 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -40,6 +40,8 @@ /obj/machinery/atmospherics/unary/vent_pump/examine(mob/user) . = ..() . += "This pumps the contents of the attached pipenet out into the atmosphere. Can be controlled from an Air Alarm." + if(welded) + . += "It seems welded shut." /obj/machinery/atmospherics/unary/vent_pump/on on = TRUE @@ -243,11 +245,6 @@ continue W.forceMove(get_turf(src)) -/obj/machinery/atmospherics/unary/vent_pump/examine(mob/user) - . = ..() - if(welded) - . += "It seems welded shut." - /obj/machinery/atmospherics/unary/vent_pump/power_change() if(!..()) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 5d470e590a6..c43ab00ad58 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -44,6 +44,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/examine(mob/user) . = ..() . += "This filters the atmosphere of harmful gas. Filtered gas goes straight into the connected pipenet. Controlled by an Air Alarm." + if(welded) + . += "It seems welded shut." /obj/machinery/atmospherics/unary/vent_scrubber/Destroy() if(initial_loc) @@ -51,11 +53,6 @@ return ..() -/obj/machinery/atmospherics/unary/vent_scrubber/examine(mob/user) - . = ..() - if(welded) - . += "It seems welded shut." - /obj/machinery/atmospherics/unary/vent_scrubber/update_overlays() . = ..() plane = FLOOR_PLANE diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 1f724e7386a..eb0ce0a7132 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -227,17 +227,3 @@ /// The current fullscreen state for /client/toggle_fullscreen() var/fullscreen = FALSE - -/client/vv_edit_var(var_name, var_value) - switch(var_name) - // I know we will never be in a world where admins are editing client vars to let people bypass TOS - // But guess what, if I have the ability to overengineer something, I am going to do it - if("tos_consent") - return FALSE - // Dont fuck with this - if("cui_entries") - return FALSE - // or this - if("jbh") - return FALSE - return ..() diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 9234e19c680..9baed58985b 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -47,6 +47,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/Destroy() STOP_PROCESSING(SSobj, src) QDEL_NULL(soundloop) + suit = null return ..() /obj/item/clothing/head/helmet/space/hardsuit/attack_self(mob/user) @@ -181,10 +182,6 @@ QDEL_NULL(jetpack) return ..() -/obj/item/clothing/head/helmet/space/hardsuit/Destroy() - suit = null - return ..() - /obj/item/clothing/suit/space/hardsuit/proc/MakeHelmet() if(!helmettype) return @@ -230,6 +227,8 @@ /obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot) ..() + if(helmettype && slot != SLOT_HUD_OUTER_SUIT) + RemoveHelmet() if(jetpack) if(slot == SLOT_HUD_OUTER_SUIT) for(var/X in jetpack.actions) @@ -238,6 +237,7 @@ /obj/item/clothing/suit/space/hardsuit/dropped(mob/user) ..() + RemoveHelmet() if(jetpack) for(var/X in jetpack.actions) var/datum/action/A = X diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 1cd0e2f1e20..c6b4c1beb53 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -5,13 +5,6 @@ ..() ToggleHelmet() -/obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot) - if(!helmettype) - return - if(slot != SLOT_HUD_OUTER_SUIT) - RemoveHelmet() - ..() - /obj/item/clothing/suit/space/hardsuit/proc/RemoveHelmet() if(!helmet) return @@ -28,10 +21,6 @@ else helmet.forceMove(src) -/obj/item/clothing/suit/space/hardsuit/dropped() - ..() - RemoveHelmet() - /obj/item/clothing/suit/space/hardsuit/proc/ToggleHelmet() var/mob/living/carbon/human/H = src.loc if(!helmettype) diff --git a/code/modules/events/blob/blob_mobs.dm b/code/modules/events/blob/blob_mobs.dm index 85f57c126ab..57d8dc3232b 100644 --- a/code/modules/events/blob/blob_mobs.dm +++ b/code/modules/events/blob/blob_mobs.dm @@ -204,6 +204,8 @@ . = ..() var/datum/action/innate/communicate_overmind_blob/overmind_chat = new overmind_chat.Grant(src) + if(name == "blobbernaut") + name = "blobbernaut ([rand(1, 1000)])" /datum/action/innate/communicate_overmind_blob name = "Speak with the overmind" @@ -228,11 +230,6 @@ adjustFireLoss(0.2) ..() -/mob/living/simple_animal/hostile/blob/blobbernaut/Initialize(mapload) - . = ..() - if(name == "blobbernaut") - name = "blobbernaut ([rand(1, 1000)])" - /mob/living/simple_animal/hostile/blob/blobbernaut/death(gibbed) // Only execute the below if we successfully died . = ..() diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm index 834f58222a4..89757f89d5e 100644 --- a/code/modules/lighting/lighting_atom.dm +++ b/code/modules/lighting/lighting_atom.dm @@ -48,16 +48,6 @@ /atom/proc/extinguish_light(force = FALSE) return -// If we have opacity, make sure to tell (potentially) affected light sources. -/atom/movable/Destroy() - var/turf/T = loc - . = ..() - if(opacity && istype(T)) - var/old_has_opaque_atom = T.has_opaque_atom - T.recalc_atom_opacity() - if(old_has_opaque_atom != T.has_opaque_atom) - T.reconsider_lights() - // Should always be used to change the opacity of an atom. // It notifies (potentially) affected light sources so they can update (if needed). /atom/proc/set_opacity(new_opacity) @@ -78,23 +68,6 @@ if(old_has_opaque_atom != T.has_opaque_atom) T.reconsider_lights() -/atom/vv_edit_var(var_name, var_value) - switch(var_name) - if("light_range") - set_light(l_range=var_value) - return TRUE - - if("light_power") - set_light(l_power=var_value) - return TRUE - - if("light_color") - set_light(l_color=var_value) - return TRUE - - return ..() - - /atom/proc/flash_lighting_fx(_range = FLASH_LIGHT_RANGE, _power = FLASH_LIGHT_POWER, _color = LIGHT_COLOR_WHITE, _duration = FLASH_LIGHT_DURATION, _reset_lighting = TRUE) return diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index f5e1a869df4..eaff6e6c647 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -27,8 +27,6 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() -/obj/machinery/mineral/equipment_vendor/Initialize(mapload) - . = ..() prize_list = list() prize_list["Gear"] = list( EQUIPMENT("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800), @@ -313,8 +311,6 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() -/obj/machinery/mineral/equipment_vendor/golem/Initialize() - . = ..() desc += "\nIt seems a few selections have been added." prize_list["Extra"] += list( EQUIPMENT("Extra ID", /obj/item/card/id/golem, 250), @@ -344,8 +340,6 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() -/obj/machinery/mineral/equipment_vendor/labor/Initialize() - . = ..() prize_list = list() prize_list["Scum"] += list( EQUIPMENT("Trauma Kit", /obj/item/stack/medical/bruise_pack/advanced, 150), @@ -388,8 +382,6 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() -/obj/machinery/mineral/equipment_vendor/explorer/Initialize(mapload) - . = ..() prize_list = list() prize_list["Equipment"] = list( EQUIPMENT("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800), diff --git a/code/modules/mob/living/carbon/alien/alien_base.dm b/code/modules/mob/living/carbon/alien/alien_base.dm index 840703d26f3..e37f2a8705e 100644 --- a/code/modules/mob/living/carbon/alien/alien_base.dm +++ b/code/modules/mob/living/carbon/alien/alien_base.dm @@ -164,13 +164,6 @@ return threatcount -/mob/living/carbon/alien/death(gibbed) - . = ..() - if(!.) - return - - deathrattle() - /mob/living/carbon/alien/proc/deathrattle() var/alien_message = deathrattle_message() for(var/mob/living/carbon/alien/M in GLOB.player_list) diff --git a/code/modules/mob/living/carbon/alien/alien_death.dm b/code/modules/mob/living/carbon/alien/alien_death.dm index d6bf44791b1..58be5381c59 100644 --- a/code/modules/mob/living/carbon/alien/alien_death.dm +++ b/code/modules/mob/living/carbon/alien/alien_death.dm @@ -72,3 +72,5 @@ playsound(loc, death_sound, 80, TRUE, 1) visible_message("[src] [death_message]") update_icons() + + deathrattle() diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index dd035515c2e..f9d728abfab 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -4,28 +4,6 @@ . += GLOB.configuration.movement.human_delay . += dna.species.movement_delay(src) -/mob/living/carbon/human/Process_Spacemove(movement_dir = 0) - - if(..()) - return TRUE - - //Do we have a working jetpack? - var/obj/item/tank/jetpack/thrust - if(istype(back, /obj/item/tank/jetpack)) - thrust = back - else if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit)) - var/obj/item/clothing/suit/space/hardsuit/C = wear_suit - thrust = C.jetpack - else if(ismodcontrol(back)) - var/obj/item/mod/control/C = back - thrust = locate(/obj/item/mod/module/jetpack) in C - if(thrust) - if((movement_dir || thrust.stabilizers) && thrust.allow_thrust(0.01, src)) - return TRUE - if(dna.species.spec_Process_Spacemove(src)) - return TRUE - return FALSE - /mob/living/carbon/human/mob_has_gravity() . = ..() if(!.) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c9cf61fc8a4..c986e24f10d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1086,8 +1086,6 @@ GLOB.dead_mob_list += src . = ..() switch(var_name) - if("maxHealth") - updatehealth() if("resize") update_transform() if("lighting_alpha") @@ -1095,6 +1093,10 @@ if("advanced_bullet_dodge_chance") UnregisterSignal(src, COMSIG_ATOM_PREHIT) RegisterSignal(src, COMSIG_ATOM_PREHIT, PROC_REF(advanced_bullet_dodge)) + if("maxHealth") + updatehealth("var edit") + if("resize") + update_transform() /mob/living/throw_at(atom/target, range, speed, mob/thrower, spin, diagonals_first, datum/callback/callback, force, dodgeable, block_movement) stop_pulling() diff --git a/code/modules/mob/living/living_update_status.dm b/code/modules/mob/living/living_update_status.dm index 5f729221cf5..8ffe9b213c7 100644 --- a/code/modules/mob/living/living_update_status.dm +++ b/code/modules/mob/living/living_update_status.dm @@ -89,11 +89,3 @@ /mob/living/proc/update_stamina() return - -/mob/living/vv_edit_var(var_name, var_value) - . = ..() - switch(var_name) - if("maxHealth") - updatehealth("var edit") - if("resize") - update_transform() diff --git a/code/modules/mob/living/silicon/robot/robot_laws.dm b/code/modules/mob/living/silicon/robot/robot_laws.dm index 7dfb82c861f..c8a1ae9a12e 100644 --- a/code/modules/mob/living/silicon/robot/robot_laws.dm +++ b/code/modules/mob/living/silicon/robot/robot_laws.dm @@ -68,6 +68,8 @@ /mob/living/silicon/robot/set_zeroth_law(law, law_borg) if(mmi && mmi.syndiemmi) return FALSE + if(tracking_entities) + to_chat(src, "Internal camera is currently being accessed.") ..() /mob/living/silicon/robot/clear_zeroth_law() diff --git a/code/modules/mob/living/silicon/robot/syndicate_robot.dm b/code/modules/mob/living/silicon/robot/syndicate_robot.dm index 47f25fa6dbf..17801c1a2e3 100644 --- a/code/modules/mob/living/silicon/robot/syndicate_robot.dm +++ b/code/modules/mob/living/silicon/robot/syndicate_robot.dm @@ -136,8 +136,3 @@ if(cham_proj) cham_proj.disrupt(src) ..() - -/mob/living/silicon/robot/syndicate/saboteur/attackby() - if(cham_proj) - cham_proj.disrupt(src) - ..() diff --git a/code/modules/mob/living/silicon/silicon_death.dm b/code/modules/mob/living/silicon/silicon_death.dm index f750829e1fb..a829d5e944e 100644 --- a/code/modules/mob/living/silicon/silicon_death.dm +++ b/code/modules/mob/living/silicon/silicon_death.dm @@ -46,3 +46,5 @@ if(. && !gibbed) if(death_sound) playsound(get_turf(src), death_sound, 200, 1) + if(gibbed) + drop_hat() diff --git a/code/modules/mob/living/silicon/silicon_laws.dm b/code/modules/mob/living/silicon/silicon_laws.dm index b989fa2988e..ace60763b8f 100644 --- a/code/modules/mob/living/silicon/silicon_laws.dm +++ b/code/modules/mob/living/silicon/silicon_laws.dm @@ -14,11 +14,6 @@ if(!isnull(usr) && law) log_and_message_admins("has given [src] the zeroth laws: [law]/[law_borg ? law_borg : "N/A"]") -/mob/living/silicon/robot/set_zeroth_law(law, law_borg) - ..() - if(tracking_entities) - to_chat(src, "Internal camera is currently being accessed.") - /mob/living/silicon/proc/add_ion_law(law) throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() diff --git a/code/modules/mob/living/silicon/silicon_mob.dm b/code/modules/mob/living/silicon/silicon_mob.dm index 8c5026b2ec3..157e2fea9dd 100644 --- a/code/modules/mob/living/silicon/silicon_mob.dm +++ b/code/modules/mob/living/silicon/silicon_mob.dm @@ -589,11 +589,6 @@ hat_alpha = null hat_color = null -/mob/living/silicon/death(gibbed) - if(gibbed) - drop_hat() - . = ..() - /mob/living/silicon/examine(mob/user) . = ..() if(silicon_hat) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index f4c2c989097..9f3f30662a8 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -202,6 +202,24 @@ set_weapon() /mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj) + if(!disabled) + var/lasertag_check = FALSE + if(lasercolor == "b") + if(istype(Proj, /obj/item/projectile/beam/lasertag/redtag)) + lasertag_check = TRUE + + else if(lasercolor == "r") + if(istype(Proj, /obj/item/projectile/beam/lasertag/bluetag)) + lasertag_check = TRUE + + if(lasertag_check) + icon_state = "[lasercolor]ed2090" + disabled = TRUE + walk_to(src, 0) + target = null + addtimer(CALLBACK(src, PROC_REF(unset_disabled)), 10 SECONDS) + return TRUE + if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet)) if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)) if(!Proj.nodamage && Proj.damage < src.health) @@ -498,32 +516,6 @@ target = toarrest mode = BOT_HUNT - -/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj) - if(!disabled) - var/lasertag_check = 0 - if(lasercolor == "b") - if(istype(Proj, /obj/item/projectile/beam/lasertag/redtag)) - lasertag_check++ - - else if(lasercolor == "r") - if(istype(Proj, /obj/item/projectile/beam/lasertag/bluetag)) - lasertag_check++ - - if(lasertag_check) - icon_state = "[lasercolor]ed2090" - disabled = TRUE - walk_to(src, 0) - target = null - addtimer(CALLBACK(src, PROC_REF(unset_disabled)), 10 SECONDS) - return TRUE - - else - ..(Proj) - - else - ..(Proj) - /mob/living/simple_animal/bot/ed209/proc/unset_disabled() disabled = FALSE icon_state = "[lasercolor]ed2091" diff --git a/code/modules/mob/living/simple_animal/bot/griefsky.dm b/code/modules/mob/living/simple_animal/bot/griefsky.dm index b5bcd9b442b..58a3b073152 100644 --- a/code/modules/mob/living/simple_animal/bot/griefsky.dm +++ b/code/modules/mob/living/simple_animal/bot/griefsky.dm @@ -207,18 +207,7 @@ //this section is blocking attack -/mob/living/simple_animal/bot/secbot/griefsky/bullet_act(obj/item/projectile/P) //so uncivilized - retaliate(P.firer) - if((icon_state == spin_icon) && (prob(block_chance_ranged))) //only when the eswords are on - visible_message("[src] deflects [P] with its energy swords!") - playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, 0) - else - ..() - -/mob/living/simple_animal/bot/secbot/griefsky/proc/special_retaliate_after_attack(mob/user) //allows special actions to take place after being attacked. - return - -/mob/living/simple_animal/bot/secbot/griefsky/special_retaliate_after_attack(mob/user) +/mob/living/simple_animal/bot/secbot/griefsky/proc/special_retaliate_after_attack(mob/user) if(icon_state != spin_icon) return if(prob(block_chance_melee)) diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 3afe53239e3..5d28b33ca16 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -120,7 +120,7 @@ name = "Corpse of a Space Wizard" outfit = /datum/outfit/wizardcorpse -/obj/effect/mob_spawn/human/corpse/clown/officer/Initialize(mapload) +/obj/effect/mob_spawn/human/corpse/wizard/officer/Initialize(mapload) mob_name = "[pick(GLOB.wizard_first)], [pick(GLOB.wizard_second)]" . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm index 04670f69d5a..063ac6b55ea 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm @@ -1,21 +1,3 @@ -// This is important -/mob/living/attack_ghost(mob/dead/observer/user) - if(prob(80)) return ..() - var/found = 0 - for(var/mob/living/simple_animal/hostile/retaliate/R in range(4,src)) - if(R.faction != "undead" || R == src || prob(50)) continue - found = 1 - R.enemies ^= src - if(src in R.enemies) - R.visible_message("[R]'s head swivels eerily towards [src].") - else - R.visible_message("[R] stares at [src] for a minute before turning away.") - if(R.target == src) - R.target = null - if(!found) - return ..() - - /mob/living/simple_animal/hostile/retaliate/ghost icon = 'icons/mob/mob.dmi' name = "ghost" diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm index 8cf7af301e1..a5474f7f6e1 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm @@ -30,6 +30,8 @@ /obj/structure/spider/spiderling/terror_spiderling/Destroy() GLOB.ts_spiderling_list -= src + for(var/obj/structure/spider/spiderling/terror_spiderling/S in view(7, src)) + S.immediate_ventcrawl = TRUE return ..() /obj/structure/spider/spiderling/terror_spiderling/Bump(obj/O) @@ -37,12 +39,6 @@ forceMove(O.loc) . = ..() - -/obj/structure/spider/spiderling/terror_spiderling/Destroy() - for(var/obj/structure/spider/spiderling/terror_spiderling/S in view(7, src)) - S.immediate_ventcrawl = TRUE - return ..() - /obj/structure/spider/spiderling/terror_spiderling/proc/score_surroundings(atom/A = src) var/safety_score = 0 var/turf/T = get_turf(A) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 8cb03da0998..9b2a77bc05e 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -386,6 +386,14 @@ /mob/living/simple_animal/revive() ..() density = initial(density) + health = maxHealth + icon = initial(icon) + icon_state = icon_living + density = initial(density) + flying = initial(flying) + if(collar_type) + collar_type = "[initial(collar_type)]" + regenerate_icons() /mob/living/simple_animal/death(gibbed) // Only execute the below if we successfully died @@ -465,17 +473,6 @@ if(on_fire) overlays += image("icon"='icons/mob/OnFire.dmi', "icon_state"="Generic_mob_burning") -/mob/living/simple_animal/revive() - ..() - health = maxHealth - icon = initial(icon) - icon_state = icon_living - density = initial(density) - flying = initial(flying) - if(collar_type) - collar_type = "[initial(collar_type)]" - regenerate_icons() - /mob/living/simple_animal/proc/make_babies() // <3 <3 <3 if(current_offspring >= max_offspring) return FALSE @@ -620,12 +617,6 @@ if(pulledby || shouldwakeup) toggle_ai(AI_ON) -/mob/living/simple_animal/adjustHealth(amount, updating_health = TRUE) - . = ..() - if(!ckey && stat == CONSCIOUS)//Not unconscious - if(AIStatus == AI_IDLE) - toggle_ai(AI_ON) - /mob/living/simple_animal/onTransitZ(old_z, new_z) ..() if(AIStatus == AI_Z_OFF) diff --git a/code/modules/mob/living/simple_animal/simple_animal_damage.dm b/code/modules/mob/living/simple_animal/simple_animal_damage.dm index fdcbf95216b..d2ddc3c894f 100644 --- a/code/modules/mob/living/simple_animal/simple_animal_damage.dm +++ b/code/modules/mob/living/simple_animal/simple_animal_damage.dm @@ -11,6 +11,9 @@ . = STATUS_UPDATE_HEALTH if(updating_health) updatehealth() + if(!ckey && stat == CONSCIOUS)//Not unconscious + if(AIStatus == AI_IDLE) + toggle_ai(AI_ON) /mob/living/simple_animal/adjustBruteLoss(amount, updating_health = TRUE) if(damage_coeff[BRUTE]) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index a3666a8e5ae..28b9cc75446 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1031,10 +1031,6 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ qdel(S) mob_spell_list -= S -//override to avoid rotating pixel_xy on mobs -/mob/shuttleRotate(rotation) - dir = angle2dir(rotation+dir2angle(dir)) - /mob/proc/handle_ventcrawl() return // Only living mobs can ventcrawl diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 8b58152f4f1..3c41d1ba3b9 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -253,6 +253,7 @@ if(!wearer || old_loc != wearer || loc == wearer) return clean_up() + bag?.update_viewers() /obj/item/mod/control/MouseDrop(atom/over_object) if(iscarbon(usr)) @@ -775,7 +776,3 @@ . = ..() for(var/obj/item/mod/module/module as anything in modules) module.extinguish_light(force) - -/obj/item/mod/control/Moved(atom/oldloc, dir, forced = FALSE) - . = ..() - bag?.update_viewers() diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index f4f6624fec1..f7dc549a2b7 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -19,6 +19,13 @@ /obj/item/mod/module/storage/Initialize() . = ..() ADD_TRAIT(src, TRAIT_ADJACENCY_TRANSPARENT, ROUNDSTART_TRAIT) + var/obj/item/storage/backpack/modstorage/S = new(src) + bag = S + bag.max_w_class = max_w_class + bag.max_combined_w_class = max_combined_w_class + bag.storage_slots = max_items + bag.source = src + bag.forceMove(src) /obj/item/mod/module/storage/serialize() var/list/data = ..() @@ -31,16 +38,6 @@ bag = list_to_object(data["bag"], src) bag.source = src -/obj/item/mod/module/storage/Initialize(mapload) - . = ..() - var/obj/item/storage/backpack/modstorage/S = new(src) - bag = S - bag.max_w_class = max_w_class - bag.max_combined_w_class = max_combined_w_class - bag.storage_slots = max_items - bag.source = src - bag.forceMove(src) - /obj/item/mod/module/storage/Destroy() QDEL_NULL(bag) return ..() diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index f0c31a29955..06c4704c21f 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -312,16 +312,6 @@ /obj/item/mod/module/ash_accretion/Initialize(mapload) . = ..() armor_mod_2 = new armor_mod_1 - -/obj/item/mod/module/ash_accretion/Destroy() - QDEL_NULL(armor_mod_2) - return ..() - -/obj/item/mod/armor/mod_ash_accretion - armor = list(MELEE = 4, BULLET = 1, LASER = 2, ENERGY = 1, BOMB = 4, RAD = 0, FIRE = 0, ACID = 0) - -/obj/item/mod/module/ash_accretion/Initialize(mapload) - . = ..() if(!accretion_turfs) accretion_turfs = typecacheof(list( /turf/simulated/floor/plating/asteroid @@ -333,6 +323,13 @@ /turf/simulated/floor/indestructible/necropolis )) +/obj/item/mod/module/ash_accretion/Destroy() + QDEL_NULL(armor_mod_2) + return ..() + +/obj/item/mod/armor/mod_ash_accretion + armor = list(MELEE = 4, BULLET = 1, LASER = 2, ENERGY = 1, BOMB = 4, RAD = 0, FIRE = 0, ACID = 0) + /obj/item/mod/module/ash_accretion/on_suit_activation() RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 14f700299f0..0c326747ddf 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -494,6 +494,8 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor /obj/item/camera/digital/examine(mob/user) . = ..() . += "A small screen shows that there are currently [length(saved_pictures)] pictures stored." + . += "Alt-Shift-Click [src] to print a specific photo." + . += "Ctrl-Shift-Click [src] to delete a specific photo." /obj/item/camera/digital/afterattack(atom/target, mob/user, flag) if(!on || !pictures_left || ismob(target.loc)) @@ -530,11 +532,6 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor var/datum/picture/P = createpicture(target, user, turfs, mobs, flag) saved_pictures += P -/obj/item/camera/digital/examine(mob/user) - . = ..() - . += "Alt-Shift-Click [src] to print a specific photo." - . += "Ctrl-Shift-Click [src] to delete a specific photo." - /obj/item/camera/digital/AltShiftClick(mob/user) if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user)) return diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm index e3881cbd96c..c2fcf54cb88 100644 --- a/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm @@ -234,10 +234,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin var/strength = 0 var/desc_holder = null -/obj/structure/particle_accelerator/examine(mob/user) - . = ..() - . += "Alt-Click to rotate it." - /obj/machinery/particle_accelerator/AltClick(mob/user) if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user)) return diff --git a/code/modules/power/generators/thermo_electric_generator.dm b/code/modules/power/generators/thermo_electric_generator.dm index 222ea5d94c3..eb1f3cf806d 100644 --- a/code/modules/power/generators/thermo_electric_generator.dm +++ b/code/modules/power/generators/thermo_electric_generator.dm @@ -40,10 +40,6 @@ if(powernet) disconnect_from_network() -/obj/machinery/power/teg/Initialize() - . = ..() - connect() - /obj/machinery/power/teg/proc/connect() connect_to_network() diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 7afa753ce01..c5f35cffa97 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -11,6 +11,7 @@ /obj/item/gun/projectile/revolver/examine(mob/user) . = ..() + . += "[get_ammo(0, 0)] of those are live rounds." . += "You can Alt-Click [src] to spin it's barrel." /obj/item/gun/projectile/revolver/chamber_round(spin = 1) @@ -80,10 +81,6 @@ boolets += magazine.ammo_count(countempties) return boolets -/obj/item/gun/projectile/revolver/examine(mob/user) - . = ..() - . += "[get_ammo(0,0)] of those are live rounds." - /obj/item/gun/projectile/revolver/fake /obj/item/gun/projectile/revolver/fake/examine(mob/user) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index d282240d3a8..c2dd32ea876 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -21,6 +21,8 @@ /obj/item/gun/projectile/shotgun/examine(mob/user) . = ..() + if(chambered) + . += "A [chambered.BB ? "live" : "spent"] one is in the chamber." . += get_shotgun_info() /obj/item/gun/projectile/shotgun/proc/get_shotgun_info() @@ -72,11 +74,6 @@ var/obj/item/ammo_casing/AC = magazine.get_round() //load next casing. chambered = AC -/obj/item/gun/projectile/shotgun/examine(mob/user) - . = ..() - if(chambered) - . += "A [chambered.BB ? "live" : "spent"] one is in the chamber." - /obj/item/gun/projectile/shotgun/lethal mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 1edfcd5125e..3b48076814e 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -636,11 +636,6 @@ else return ..(mover, target, height) - -/obj/machinery/disposal/singularity_pull(S, current_size) - if(current_size >= STAGE_FIVE) - qdel(src) - /obj/machinery/disposal/get_remote_view_fullscreens(mob/user) if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS))) user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/stretch/impaired, 2) diff --git a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm index 35c509798e1..e0db4767a23 100644 --- a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm +++ b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm @@ -34,9 +34,6 @@ /obj/effect/clockwork/overlay/singularity_act() return -/obj/effect/clockwork/overlay/singularity_pull() - return - /obj/effect/clockwork/overlay/singularity_pull(S, current_size) return diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 6c87d6ca3f7..e174827f4ef 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -27,8 +27,6 @@ for(var/obj/machinery/door/airlock/D in orange(1, src)) INVOKE_ASYNC(D, PROC_REF(close), 0, 1) -/obj/machinery/door/airlock/onShuttleMove() - . = ..() if(id_tag == "s_docking_airlock") INVOKE_ASYNC(src, PROC_REF(lock)) diff --git a/code/modules/surgery/organs/brain.dm b/code/modules/surgery/organs/brain.dm index 2f62ba3455a..45ccd25faaf 100644 --- a/code/modules/surgery/organs/brain.dm +++ b/code/modules/surgery/organs/brain.dm @@ -206,10 +206,6 @@ icon = 'icons/obj/wizard.dmi' icon_state = "scroll" -/obj/item/organ/internal/brain/Destroy() //copypasted from MMIs. - QDEL_NULL(brainmob) - return ..() - /obj/item/organ/internal/brain/cluwne /obj/item/organ/internal/brain/cluwne/insert(mob/living/target, special = 0, make_cluwne = 1) diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm index 90d01176c05..7704c6707c5 100644 --- a/code/modules/surgery/organs/organ_icon.dm +++ b/code/modules/surgery/organs/organ_icon.dm @@ -55,10 +55,6 @@ var/obj/item/organ/internal/eyes/eyes = owner.get_int_organ(/obj/item/organ/internal/eyes)//owner.internal_bodyparts_by_name["eyes"] if(eyes) eyes.update_colour() -/obj/item/organ/external/head/remove(mob/living/user, ignore_children) - get_icon() - . = ..() - /obj/item/organ/external/proc/get_icon(skeletal) // Kasparrov, you monster if(force_icon) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index c53f1285d55..6a67faa8ccd 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -133,6 +133,17 @@ /obj/item/organ/internal/emp_act(severity) if(!is_robotic() || emp_proof) return + + var/we_done = FALSE + for(var/organ_tag in organ_datums) + var/datum/organ/borgan = organ_datums[organ_tag] + if(borgan.on_successful_emp()) + we_done = TRUE + + if(we_done) + return + + // No EMP handling was done, lets just give em damage switch(severity) if(1) receive_damage(20, 1) @@ -368,26 +379,6 @@ head_organ.facial_colour = "#D8C078" H.update_fhair() -/obj/item/organ/internal/emp_act(severity) - if(!is_robotic() || emp_proof) - return - - var/we_done = FALSE - for(var/organ_tag in organ_datums) - var/datum/organ/borgan = organ_datums[organ_tag] - if(borgan.on_successful_emp()) - we_done = TRUE - - if(we_done) - return - - // No EMP handling was done, lets just give em damage - switch(severity) - if(1) - receive_damage(20, 1) - if(2) - receive_damage(7, 1) - /obj/item/organ/internal/handle_germs() ..() if(germ_level >= INFECTION_LEVEL_TWO) diff --git a/code/modules/surgery/organs/subtypes/standard_organs.dm b/code/modules/surgery/organs/subtypes/standard_organs.dm index d4f54450758..bba265b2537 100644 --- a/code/modules/surgery/organs/subtypes/standard_organs.dm +++ b/code/modules/surgery/organs/subtypes/standard_organs.dm @@ -283,6 +283,7 @@ owner.update_fhair() owner.update_head_accessory() owner.update_markings() + get_icon() . = ..() /obj/item/organ/external/head/replaced() diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 21393d49fc1..5878ead2163 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -54,6 +54,7 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/gps/dropped(mob/user, silent) REMOVE_TRAIT(user, TRAIT_HAS_GPS, "GPS[UID()]") + REMOVE_TRAIT(user, TRAIT_CAN_VIEW_HEALTH, "HEALTH[UID()]") return ..() /obj/item/gps/emp_act(severity) diff --git a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm index 75fbb8425bf..acdcadef70e 100644 --- a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm +++ b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm @@ -185,12 +185,6 @@ var/dir_to_move = get_dir(trailer.loc, old_loc) step(trailer, dir_to_move) -/obj/tgvehicle/generate_action_type(actiontype) - var/datum/action/vehicle/A = ..() - . = A - if(istype(A)) - A.vehicle_ridden_target = src - /obj/tgvehicle/post_unbuckle_mob(mob/living/M) remove_occupant(M) return ..()