From 6504815fe3db364e8e9a589e8c664910e619cc77 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Fri, 9 Aug 2024 19:08:37 +0200 Subject: [PATCH] Gravity generator removal (#6751) # About the pull request not used and super ugly old ss13 sprites that should not be used on maps # Explain why it's good for the game less legacy mess # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: del: removes gravity generator (ugly legacy stuff) /:cl: --------- Co-authored-by: vincibrv --- code/_onclick/human.dm | 2 +- code/modules/power/gravitygenerator.dm | 23 ----------------------- colonialmarines.dme | 1 - maps/map_files/CORSAT/Corsat.dmm | 6 ------ maps/predship/huntership.dmm | 6 ++++-- 5 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 code/modules/power/gravitygenerator.dm diff --git a/code/_onclick/human.dm b/code/_onclick/human.dm index b09c26ffb92f..4a353d5ed5c5 100644 --- a/code/_onclick/human.dm +++ b/code/_onclick/human.dm @@ -38,7 +38,7 @@ if (A != src) return ..() var/mob/living/carbon/human/H = A - if (last_chew + 75 > world.time) + if (last_chew + 1 > world.time) to_chat(H, SPAN_DANGER("You can't bite your hand again yet...")) return diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm deleted file mode 100644 index c3d4698fbc03..000000000000 --- a/code/modules/power/gravitygenerator.dm +++ /dev/null @@ -1,23 +0,0 @@ -// It... uses a lot of power. Everything under power is engineering stuff, at least. - -/obj/structure/machinery/computer/gravity_control_computer - name = "Gravity Generator Control" - desc = "A computer to control a local gravity generator. Qualified personnel only." - icon = 'icons/obj/structures/machinery/computer.dmi' - icon_state = "gravitycomp" - anchored = TRUE - density = TRUE - var/obj/structure/machinery/gravity_generator = null - - -/obj/structure/machinery/gravity_generator - name = "Gravitational Generator" - desc = "A device which produces a gravaton field when set up." - icon = 'icons/obj/structures/props/singularity.dmi' - icon_state = "TheSingGen" - anchored = TRUE - density = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 200 - active_power_usage = 1000 - var/on = 1 diff --git a/colonialmarines.dme b/colonialmarines.dme index a5109c8dd48a..8374bb19415a 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -2192,7 +2192,6 @@ #include "code\modules\power\cell.dm" #include "code\modules\power\fractal_reactor.dm" #include "code\modules\power\generator.dm" -#include "code\modules\power\gravitygenerator.dm" #include "code\modules\power\lighting.dm" #include "code\modules\power\port_gen.dm" #include "code\modules\power\power.dm" diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 42c903cab227..59f0a59d6ca5 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -40319,12 +40319,6 @@ /turf/open/floor/corsat/yellow, /area/corsat/gamma/engineering/atmos) "qVd" = ( -/obj/structure/machinery/gravity_generator{ - desc = "Absorbs and redirects radiation, hopefully away from you."; - name = "Radiation Collector"; - pixel_x = 15; - pixel_y = -5 - }, /obj/structure/platform{ dir = 1 }, diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index 70bfb5c2914b..6247c6ce1347 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -828,7 +828,8 @@ /turf/open/shuttle/predship, /area/yautja) "co" = ( -/obj/structure/machinery/gravity_generator, +/obj/structure/machinery/portable_atmospherics/canister/phoron, +/obj/structure/window/phoronreinforced, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" }, @@ -934,7 +935,8 @@ /turf/open/floor/corsat/squareswood/north, /area/yautja) "cy" = ( -/obj/structure/machinery/gravity_generator, +/obj/structure/window/phoronreinforced, +/obj/structure/machinery/portable_atmospherics/canister/phoron, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" },