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
This commit is contained in:
Sirryan2002
2021-06-04 10:49:12 +01:00
committed by GitHub
parent 27f8610b23
commit 98b97e02b0
18 changed files with 0 additions and 147 deletions
-3
View File
@@ -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
*
-8
View File
@@ -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
@@ -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."
@@ -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, "<span class='warning'>Only one with forbidden knowledge could hope to work this metal...</span>")
@@ -51,10 +51,6 @@
if(0 to 40)
return "<span class='danger'>It looks heavily damaged.</span>"
/obj/structure/falsewall/ratvar_act()
new /obj/structure/falsewall/brass(loc)
qdel(src)
/obj/structure/falsewall/Destroy()
density = 0
air_update_turf(1)
-10
View File
@@ -55,13 +55,6 @@
if(!anchored)
. += "<span class='notice'>The anchoring screws are <i>unscrewed</i>. The rods look like they could be <b>cut</b> through.</span>"
/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
-24
View File
@@ -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
@@ -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))
@@ -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
*/
@@ -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
*/
-11
View File
@@ -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)
-5
View File
@@ -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)
@@ -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
@@ -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))
@@ -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
@@ -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
-21
View File
@@ -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, "<span class='userdanger'>The wall's intense heat completely reflects your [M.name]'s attack!</span>")
M.take_damage(20, BURN)
/turf/simulated/wall/clockwork/proc/turn_up_the_heat()
if(!heated)
name = "superheated [name]"
visible_message("<span class='warning'>[src] sizzles with heat!</span>")
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("<span class='notice'>[src] cools down.</span>")
heated = FALSE
hardness = initial(hardness)
slicing_duration = initial(slicing_duration)
animate(realappearance, color = initial(realappearance.color), time = 25)
-9
View File
@@ -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