From 98b97e02b0eeb733985329dd527af6539ac4e8c6 Mon Sep 17 00:00:00 2001 From: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Date: Fri, 4 Jun 2021 05:49:12 -0400 Subject: [PATCH] Axes Ratvar_Act() from the code (#16025) * Ratvar_Act() is no more * fixes runtime with recipes * readds removed brass objects * Fixes an oopsie * removes unnecesary procs --- code/game/atoms.dm | 3 --- code/game/machinery/doors/windowdoor.dm | 8 ------- code/game/objects/items/cardboard_cutouts.dm | 4 ---- .../items/stacks/sheets/sheet_types.dm | 8 ------- code/game/objects/structures/false_walls.dm | 4 ---- code/game/objects/structures/grille.dm | 10 -------- code/game/objects/structures/lattice.dm | 24 ------------------- .../structures/stool_bed_chair_nest/chairs.dm | 8 ------- code/game/objects/structures/table_frames.dm | 4 ---- code/game/objects/structures/tables_racks.dm | 10 -------- code/game/objects/structures/window.dm | 11 --------- code/game/turfs/simulated/floor.dm | 5 ---- .../turfs/simulated/floor/indestructible.dm | 3 --- code/game/turfs/simulated/floor/misc_floor.dm | 5 ---- code/game/turfs/simulated/floor/plating.dm | 7 ------ .../turfs/simulated/walls_indestructible.dm | 3 --- code/game/turfs/simulated/walls_misc.dm | 21 ---------------- code/game/turfs/turf.dm | 9 ------- 18 files changed, 147 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 191bc9638a4..d9cc6ab55c0 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -944,9 +944,6 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/narsie_act() return -/atom/proc/ratvar_act() - return - /** * Respond to an electric bolt action on our item * diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 59d839018bb..88dc39e568c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -195,11 +195,6 @@ /obj/machinery/door/window/narsie_act() color = NARSIE_WINDOW_COLOUR -/obj/machinery/door/window/ratvar_act() - var/obj/machinery/door/window/clockwork/C = new(loc, dir) - C.name = name - qdel(src) - /obj/machinery/door/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() if(exposed_temperature > T0C + (reinf ? 1600 : 800)) @@ -358,9 +353,6 @@ if(prob(80/severity)) open() -/obj/machinery/door/window/clockwork/ratvar_act() - obj_integrity = max_integrity - /obj/machinery/door/window/clockwork/hasPower() return TRUE //yup that's power all right diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 788de290b19..f10c88e0907 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -120,10 +120,6 @@ name = "Unknown" desc = "A cardboard cutout of a cultist." icon_state = "cutout_cultist" - //if("Clockwork Cultist") - // name = "[random_name(pick(MALE,FEMALE))]" - // desc = "A cardboard cutout of a servant of Ratvar." - // icon_state = "cutout_servant" if("Revolutionary") name = "Unknown" desc = "A cardboard cutout of a revolutionary." diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 84c59310418..99dee4e4961 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -117,10 +117,6 @@ GLOBAL_LIST_INIT(metal_recipes, list( /obj/item/stack/sheet/metal/fifty amount = 50 -/obj/item/stack/sheet/metal/ratvar_act() - new /obj/item/stack/tile/brass(loc, amount) - qdel(src) - /obj/item/stack/sheet/metal/narsie_act() new /obj/item/stack/sheet/runed_metal(loc, amount) qdel(src) @@ -378,10 +374,6 @@ GLOBAL_LIST_INIT(cult_recipes, list ( \ . = ..() icon_state = SSticker.cultdat?.runed_metal_icon_state -/obj/item/stack/sheet/runed_metal/ratvar_act() - new /obj/item/stack/tile/brass(loc, amount) - qdel(src) - /obj/item/stack/sheet/runed_metal/attack_self(mob/living/user) if(!iscultist(user)) to_chat(user, "Only one with forbidden knowledge could hope to work this metal...") diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 8217a86e505..c52338b9e7d 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -51,10 +51,6 @@ if(0 to 40) return "It looks heavily damaged." -/obj/structure/falsewall/ratvar_act() - new /obj/structure/falsewall/brass(loc) - qdel(src) - /obj/structure/falsewall/Destroy() density = 0 air_update_turf(1) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 68025f98fce..c9f78cf01d0 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -55,13 +55,6 @@ if(!anchored) . += "The anchoring screws are unscrewed. The rods look like they could be cut through." -/obj/structure/grille/ratvar_act() - if(broken) - new /obj/structure/grille/ratvar/broken(loc) - else - new /obj/structure/grille/ratvar(loc) - qdel(src) - /obj/structure/grille/Bumped(atom/user) if(ismob(user)) if(!(shockcooldown <= world.time)) @@ -289,9 +282,6 @@ color = "#960000" animate(src, color = previouscolor, time = 8) -/obj/structure/grille/ratvar/ratvar_act() - return - /obj/structure/grille/ratvar/broken icon_state = "brokenratvargrille" density = FALSE diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index d84c1f39728..3561bd1f239 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -61,18 +61,6 @@ /obj/structure/lattice/clockwork/Initialize(mapload) . = ..() - ratvar_act() - -/obj/structure/lattice/clockwork/ratvar_act() - if((x + y) % 2 != 0) - icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi' - pixel_x = -9 - pixel_y = -9 - else - icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi' - pixel_x = 0 - pixel_y = 0 - return TRUE /obj/structure/lattice/catwalk name = "catwalk" @@ -109,18 +97,6 @@ /obj/structure/lattice/catwalk/clockwork/Initialize(mapload) . = ..() - ratvar_act() if(!mapload) new /obj/effect/temp_visual/ratvar/floor/catwalk(loc) new /obj/effect/temp_visual/ratvar/beam/catwalk(loc) - -/obj/structure/lattice/catwalk/clockwork/ratvar_act() - if((x + y) % 2 != 0) - icon = 'icons/obj/smooth_structures/catwalk_clockwork_large.dmi' - pixel_x = -9 - pixel_y = -9 - else - icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi' - pixel_x = 0 - pixel_y = 0 - return TRUE diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 256376d30a7..d12dc172b0c 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -24,11 +24,6 @@ W.setDir(dir) qdel(src) -/obj/structure/chair/ratvar_act() - var/obj/structure/chair/brass/B = new(get_turf(src)) - B.setDir(dir) - qdel(src) - /obj/structure/chair/Move(atom/newloc, direct) ..() handle_rotation() @@ -441,9 +436,6 @@ if(turns >= 8) STOP_PROCESSING(SSfastprocess, src) -/obj/structure/chair/brass/ratvar_act() - return - /obj/structure/chair/brass/AltClick(mob/living/user) turns = 0 if(!istype(user) || user.incapacitated() || !in_range(src, user)) diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 575f666848a..966c3f313b4 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -91,10 +91,6 @@ new /obj/structure/table_frame/wood(loc) qdel(src) -/obj/structure/table_frame/ratvar_act() - new /obj/structure/table_frame/brass(loc) - qdel(src) - /* * Wooden Frames */ diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 5bce42875fe..28e61e90e58 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -84,10 +84,6 @@ new /obj/structure/table/wood(loc) qdel(src) -/obj/structure/table/ratvar_act() - new /obj/structure/table/reinforced/brass(loc) - qdel(src) - /obj/structure/table/do_climb(mob/living/user) . = ..() item_placed(user) @@ -571,9 +567,6 @@ color = "#960000" animate(src, color = previouscolor, time = 8) -/obj/structure/table/reinforced/brass/ratvar_act() - obj_integrity = max_integrity - /obj/structure/table/tray name = "surgical tray" desc = "A small metal tray with wheels." @@ -637,9 +630,6 @@ /obj/structure/table/tray/narsie_act() return 0 -/obj/structure/table/tray/ratvar_act() - return 0 - /* * Racks */ diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index b98c8b7c4c4..0643db75416 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -72,13 +72,6 @@ /obj/structure/window/narsie_act() color = NARSIE_WINDOW_COLOUR -/obj/structure/window/ratvar_act() - if(!fulltile) - new/obj/structure/window/reinforced/clockwork(get_turf(src), dir) - else - new/obj/structure/window/reinforced/clockwork/fulltile(get_turf(src)) - qdel(src) - /obj/structure/window/rpd_act() return @@ -727,10 +720,6 @@ made_glow = TRUE ..() -/obj/structure/window/reinforced/clockwork/ratvar_act() - obj_integrity = max_integrity - update_nearby_icons() - /obj/structure/window/reinforced/clockwork/narsie_act() take_damage(rand(25, 75), BRUTE) if(src) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index c9fbd4df113..24fcba648f2 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -231,11 +231,6 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama if(prob(20)) ChangeTurf(/turf/simulated/floor/engine/cult) -/turf/simulated/floor/ratvar_act(force, ignore_mobs) - . = ..() - if(.) - ChangeTurf(/turf/simulated/floor/clockwork) - /turf/simulated/floor/acid_melt() ChangeTurf(baseturf) diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index cd7abaeb188..67e3f3f5ecd 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -15,9 +15,6 @@ /turf/simulated/floor/indestructible/narsie_act() return -/turf/simulated/floor/indestructible/ratvar_act(force, ignore_mobs) - return - /turf/simulated/floor/indestructible/burn_down() return diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 2876378eb06..96b79588793 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -176,11 +176,6 @@ QDEL_NULL(realappearence) return ..() -/turf/simulated/floor/clockwork/ReplaceWithLattice() - . = ..() - for(var/obj/structure/lattice/L in src) - L.ratvar_act() - /turf/simulated/floor/clockwork/crowbar_act(mob/user, obj/item/I) . = TRUE if(!I.tool_use_check(user, 0)) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 94d95c2af86..d0805cf5099 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -187,13 +187,6 @@ /turf/simulated/floor/engine/cult/narsie_act() return -/turf/simulated/floor/engine/cult/ratvar_act() - . = ..() - if(istype(src, /turf/simulated/floor/engine/cult)) //if we haven't changed type - var/previouscolor = color - color = "#FAE48C" - animate(src, color = previouscolor, time = 8) - //air filled floors; used in atmos pressure chambers /turf/simulated/floor/engine/n20 diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index 56feb811745..37208cd0b81 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -27,9 +27,6 @@ /turf/simulated/wall/indestructible/narsie_act() return -/turf/simulated/wall/indestructible/ratvar_act(force, ignore_mobs) - return - /turf/simulated/wall/indestructible/burn_down() return diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index e32fa627297..a841f06665e 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -69,11 +69,6 @@ QDEL_NULL(realappearance) return ..() -/turf/simulated/wall/clockwork/ReplaceWithLattice() - ..() - for(var/obj/structure/lattice/L in src) - L.ratvar_act() - /turf/simulated/wall/clockwork/narsie_act() ..() if(istype(src, /turf/simulated/wall/clockwork)) //if we haven't changed type @@ -122,19 +117,3 @@ to_chat(M.occupant, "The wall's intense heat completely reflects your [M.name]'s attack!") M.take_damage(20, BURN) -/turf/simulated/wall/clockwork/proc/turn_up_the_heat() - if(!heated) - name = "superheated [name]" - visible_message("[src] sizzles with heat!") - playsound(src, 'sound/machines/fryer/deep_fryer_emerge.ogg', 50, TRUE) - heated = TRUE - hardness = -100 //Lower numbers are tougher, so this makes the wall essentially impervious to smashing - slicing_duration = 150 - animate(realappearance, color = "#FFC3C3", time = 5) - else - name = initial(name) - visible_message("[src] cools down.") - heated = FALSE - hardness = initial(hardness) - slicing_duration = initial(slicing_duration) - animate(realappearance, color = initial(realappearance.color), time = 25) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 4678bd94ce4..108555e0dcd 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -508,15 +508,6 @@ /turf/proc/can_lay_cable() return can_have_cabling() & !intact -/turf/ratvar_act(force, ignore_mobs, probability = 40) - . = (prob(probability) || force) - for(var/I in src) - var/atom/A = I - if(ignore_mobs && ismob(A)) - continue - if(ismob(A) || .) - A.ratvar_act() - /turf/proc/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = icon underlay_appearance.icon_state = icon_state