From a4ae87054bd9f6b245812962c1299cc5fb4c6c5b Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Mon, 29 Jul 2024 22:11:20 +0200 Subject: [PATCH] Holopad removal (#6798) # About the pull request removes holopad, used only on admin level and there it is super out of place # Explain why it's good for the game those are old ai holopads that just look out of place on CM # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: del: holopad removal /:cl: --------- Co-authored-by: vincibrv --- code/game/machinery/hologram.dm | 61 -------------------------- colonialmarines.dme | 1 - maps/map_files/generic/Admin_level.dmm | 1 - 3 files changed, 63 deletions(-) delete mode 100644 code/game/machinery/hologram.dm diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm deleted file mode 100644 index fe8243704a72..000000000000 --- a/code/game/machinery/hologram.dm +++ /dev/null @@ -1,61 +0,0 @@ -/* Holograms! - * Contains: - * Hologram - * Holopad - * Other stuff - */ - - - -/* - * Hologram - */ - -/obj/structure/machinery/hologram - anchored = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 5 - active_power_usage = 100 - var/obj/effect/overlay/hologram //The projection itself. If there is one, the instrument is on, off otherwise. - -/obj/structure/machinery/hologram/ex_act(severity) - switch(severity) - if(0 to EXPLOSION_THRESHOLD_LOW) - if (prob(5)) - qdel(src) - if(EXPLOSION_THRESHOLD_LOW to EXPLOSION_THRESHOLD_MEDIUM) - if (prob(50)) - qdel(src) - if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY) - qdel(src) - -/obj/structure/machinery/hologram/Destroy() - if(hologram) - clear_holo() - return ..() - -/obj/structure/machinery/hologram/proc/clear_holo() - if(hologram) - qdel(hologram) - hologram = null - - - -/* - * Holopad - */ - -/obj/structure/machinery/hologram/holopad - name = "\improper AI holopad" - desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely." - icon_state = "holopad0" - - layer = TURF_LAYER+0.1 //Preventing mice and drones from sneaking under them. -/* - * Other Stuff: Is this even used? - */ -/obj/structure/machinery/hologram/projector - name = "hologram projector" - desc = "It makes a hologram appear...with magnets or something..." - icon = 'icons/obj/structures/props/stationobjs.dmi' - icon_state = "holopad0" diff --git a/colonialmarines.dme b/colonialmarines.dme index 47fe8f9f7313..91053b9c8c67 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -861,7 +861,6 @@ #include "code\game\machinery\fuelcell_recycler.dm" #include "code\game\machinery\fusion_engine.dm" #include "code\game\machinery\gear.dm" -#include "code\game\machinery\hologram.dm" #include "code\game\machinery\holosign.dm" #include "code\game\machinery\igniter.dm" #include "code\game\machinery\iv_drip.dm" diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm index c97821b827fb..51623753bc0d 100644 --- a/maps/map_files/generic/Admin_level.dmm +++ b/maps/map_files/generic/Admin_level.dmm @@ -579,7 +579,6 @@ /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station) "tx" = ( -/obj/structure/machinery/hologram/holopad, /turf/open/floor/carpet, /area/centcom/living) "tP" = (