diff --git a/_maps/RandomRuins/SpaceRuins/scp_294.dmm b/_maps/RandomRuins/SpaceRuins/scp_294.dmm deleted file mode 100644 index 358c1800e6..0000000000 --- a/_maps/RandomRuins/SpaceRuins/scp_294.dmm +++ /dev/null @@ -1,668 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/turf/template_noop, -/area/template_noop) -"ab" = ( -/turf/closed/wall/r_wall, -/area/ruin/space/has_grav/powered/scp_294) -"ac" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/space/nearstation) -"ad" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg2" - }, -/area/ruin/space/has_grav/powered/scp_294) -"ae" = ( -/obj/structure/lattice, -/obj/item/soap, -/turf/template_noop, -/area/space/nearstation) -"af" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 14 - }, -/obj/structure/mirror{ - pixel_x = 24 - }, -/turf/open/floor/plasteel/freezer/airless, -/area/ruin/space/has_grav/powered/scp_294) -"ag" = ( -/obj/machinery/light/small, -/turf/open/floor/plasteel/freezer/airless, -/area/ruin/space/has_grav/powered/scp_294) -"ah" = ( -/turf/open/floor/plasteel/freezer/airless, -/area/ruin/space/has_grav/powered/scp_294) -"ai" = ( -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/turf/open/floor/plasteel/freezer/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aj" = ( -/obj/machinery/porta_turret/syndicate/energy/heavy{ - desc = "An energy blaster auto-turret designed to contain and terminate in case of a breach in security."; - faction = list("scp"); - mode = 1; - name = "emergency containment breach turret" - }, -/obj/effect/turf_decal/box, -/turf/open/floor/plasteel/dark/airless, -/area/ruin/space/has_grav/powered/scp_294) -"ak" = ( -/obj/effect/turf_decal/tile/beige/corner{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/spawner/trap, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"al" = ( -/obj/structure/table, -/obj/machinery/microwave, -/obj/effect/turf_decal/tile/beige/side{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"am" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/beige/side{ - dir = 1 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"an" = ( -/obj/effect/turf_decal/tile/beige/side{ - dir = 1 - }, -/obj/machinery/chem_dispenser/scp_294, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"ao" = ( -/obj/effect/turf_decal/tile/beige/side{ - dir = 1 - }, -/obj/machinery/vending/snack, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"ap" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/beige/side{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aq" = ( -/obj/effect/turf_decal/tile/beige/corner{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/spawner/trap, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"ar" = ( -/obj/effect/turf_decal/tile/beige/corner{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"as" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/tile/beige/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"at" = ( -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"au" = ( -/obj/effect/mob_spawn/human/corpse/nanotrasensoldier{ - id_job = "Level Three Clearance Guard"; - name = "Clearance Level Three Officer"; - oxy_damage = 136 - }, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/tile/beige/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"av" = ( -/obj/effect/turf_decal/tile/beige/corner{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aw" = ( -/obj/structure/lattice, -/obj/item/shard, -/turf/template_noop, -/area/space/nearstation) -"ax" = ( -/obj/effect/turf_decal/tile/beige/side{ - dir = 8 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"ay" = ( -/obj/effect/mob_spawn/human/corpse/nanotrasensoldier{ - id_job = "Level Three Clearance Guard"; - name = "Clearance Level Three Officer"; - oxy_damage = 136 - }, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"az" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aA" = ( -/obj/effect/turf_decal/tile/beige/corner{ - dir = 9 - }, -/mob/living/simple_animal/hostile/mimic{ - faction = list("mimic","scp") - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aB" = ( -/obj/effect/turf_decal/tile/beige/side{ - dir = 1 - }, -/obj/effect/spawner/trap, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aC" = ( -/obj/effect/turf_decal/tile/beige/corner{ - dir = 5 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aD" = ( -/obj/item/trash/plate, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aE" = ( -/obj/effect/turf_decal/tile/beige/side{ - dir = 4 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aF" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aG" = ( -/obj/structure/girder, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aH" = ( -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aI" = ( -/obj/structure/fluff/broken_flooring{ - icon_state = "corner"; - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aJ" = ( -/obj/structure/table, -/obj/item/trash/sosjerky, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aK" = ( -/obj/item/chair, -/obj/effect/turf_decal/tile/beige/side{ - dir = 8 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aL" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/turf_decal/tile/beige/side{ - dir = 4 - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aM" = ( -/obj/structure/table, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aN" = ( -/obj/effect/turf_decal/tile/beige/side{ - dir = 4 - }, -/obj/structure/chair/office{ - dir = 8 - }, -/obj/item/shard, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aO" = ( -/obj/item/stack/rods, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aP" = ( -/obj/structure/fluff/broken_flooring{ - icon_state = "plating"; - name = "broken plating" - }, -/obj/structure/lattice, -/turf/template_noop, -/area/space/nearstation) -"aQ" = ( -/obj/structure/table_frame, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aR" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg1" - }, -/area/ruin/space/has_grav/powered/scp_294) -"aS" = ( -/obj/item/stack/tile/plasteel, -/mob/living/simple_animal/hostile/mimic{ - faction = list("mimic","scp") - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aT" = ( -/obj/structure/grille/broken, -/obj/item/stack/rods, -/turf/open/floor/plating/airless{ - icon_state = "platingdmg1" - }, -/area/ruin/space/has_grav/powered/scp_294) -"aU" = ( -/obj/item/shard, -/turf/open/floor/plating/airless{ - icon_state = "platingdmg1" - }, -/area/ruin/space/has_grav/powered/scp_294) -"aV" = ( -/obj/structure/lattice, -/obj/structure/fluff/broken_flooring{ - icon_state = "singular" - }, -/turf/template_noop, -/area/space/nearstation) -"aW" = ( -/obj/item/trash/cheesie, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aX" = ( -/obj/effect/turf_decal/tile/beige/side{ - dir = 4 - }, -/obj/item/chair, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aY" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"aZ" = ( -/obj/effect/mob_spawn/human/corpse/assistant, -/obj/structure/table_frame, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"ba" = ( -/obj/structure/grille/broken, -/obj/item/shard, -/obj/item/stack/rods, -/turf/open/floor/plating/airless{ - icon_state = "platingdmg1" - }, -/area/ruin/space/has_grav/powered/scp_294) -"bb" = ( -/obj/item/stack/rods, -/turf/open/floor/plating/airless{ - icon_state = "platingdmg1" - }, -/area/ruin/space/has_grav/powered/scp_294) -"bc" = ( -/obj/item/stack/tile/plasteel, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/scp_294) -"bd" = ( -/obj/structure/lattice, -/obj/structure/fluff/broken_flooring{ - icon_state = "singular"; - dir = 4 - }, -/turf/template_noop, -/area/space/nearstation) -"be" = ( -/obj/structure/fluff/broken_flooring{ - icon_state = "pile"; - dir = 4 - }, -/turf/template_noop, -/area/template_noop) -"bf" = ( -/obj/item/trash/chips, -/turf/template_noop, -/area/template_noop) -"bg" = ( -/obj/effect/spawner/trap, -/turf/open/floor/plating/airless{ - icon_state = "platingdmg2" - }, -/area/ruin/space/has_grav/powered/scp_294) -"bi" = ( -/obj/effect/spawner/trap, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) -"bj" = ( -/obj/effect/spawner/trap, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/scp_294) -"bk" = ( -/obj/structure/table_frame, -/obj/effect/spawner/trap, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/scp_294) - -(1,1,1) = {" -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -"} -(2,1,1) = {" -aa -aa -aa -aa -aa -ac -ac -aa -aa -aa -aa -aa -aa -aa -"} -(3,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -aG -ac -aV -aa -aa -aa -aa -"} -(4,1,1) = {" -aa -aa -aa -ab -aj -ar -ax -bj -aP -ac -aa -aa -aa -be -"} -(5,1,1) = {" -aa -aa -ac -ab -ak -as -ay -aI -aH -ac -ac -ac -aa -aa -"} -(6,1,1) = {" -aa -ac -ac -ab -al -at -az -aJ -aQ -bj -ad -aa -aa -bf -"} -(7,1,1) = {" -ab -ab -ab -ab -am -at -aA -aK -aR -aR -ac -ac -aa -aa -"} -(8,1,1) = {" -ac -ac -ad -ab -an -at -aB -at -aS -aW -aH -aP -aa -aa -"} -(9,1,1) = {" -aa -ae -ac -ab -ao -at -aC -aL -aE -aX -aE -ad -bg -aa -"} -(10,1,1) = {" -ac -bg -ag -ab -ap -bi -az -aM -bk -aY -bc -aR -bd -ac -"} -(11,1,1) = {" -bg -af -ah -ai -aq -au -aD -aM -aM -aZ -aR -ad -aa -aa -"} -(12,1,1) = {" -ab -ab -ab -ab -aj -av -aE -aN -aH -ad -aH -ac -aa -aa -"} -(13,1,1) = {" -aa -aa -aa -ab -ab -ab -aF -aO -aT -ba -ab -ab -aa -aa -"} -(14,1,1) = {" -aa -aa -aa -aa -ac -ac -ac -ad -aU -bb -ac -ac -aa -aa -"} -(15,1,1) = {" -aa -aa -aa -aa -aa -aw -ac -ac -bg -ac -aa -ac -aa -aa -"} -(16,1,1) = {" -aa -aa -aa -aa -aa -aa -ac -aa -aa -aw -aa -aa -aa -aa -"} -(17,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -"} diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 652bba382a..88b702e401 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -638,7 +638,7 @@ /turf/open/floor/plasteel/dark, /area/medical/chemistry) "bT" = ( -/obj/machinery/chem_dispenser/scp_294, +/obj/machinery/chem_dispenser, /turf/open/floor/plasteel/dark, /area/medical/chemistry) "bU" = ( diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index eea4088905..058c820f7a 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -269,12 +269,6 @@ name = "Whiteship Dock" description = "An abandoned but functional vessel parked in deep space, ripe for the taking." -/datum/map_template/ruin/space/scp_294 - id = "scp_294" - suffix = "scp_294.dmm" - name = "SCP-294 Containment" - description = "An abandoned asteroid base that contains several EMP-proof turrets, and a valuable artifact. Should you get past the heavy laser turrets, a valuable treasure awaits." - /datum/map_template/ruin/space/cat_experiments id = "meow" suffix = "mrow_thats_right.dmm" @@ -286,4 +280,4 @@ id = "cloning_facility" suffix = "cloning_facility.dmm" name = "Ancient Cloning Lab" - description = "An experimental cloning lab snapped off from an ancient ship. The cloner model inside lacks many modern functionalities and security measures." \ No newline at end of file + description = "An experimental cloning lab snapped off from an ancient ship. The cloner model inside lacks many modern functionalities and security measures." diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 13b9905874..c52119361b 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -464,10 +464,6 @@ name = "Listening Post" icon_state = "yellow" -/area/ruin/space/has_grav/powered/scp_294 - name = "Abandoned SCP-294 Containment" - icon_state = "yellow" - /area/ruin/space/has_grav/powered/ancient_shuttle name = "Ancient Shuttle" - icon_state = "yellow" \ No newline at end of file + icon_state = "yellow" diff --git a/code/modules/reagents/chemistry/machinery/scp_294.dm b/code/modules/reagents/chemistry/machinery/scp_294.dm deleted file mode 100644 index 59502913d4..0000000000 --- a/code/modules/reagents/chemistry/machinery/scp_294.dm +++ /dev/null @@ -1,95 +0,0 @@ -////////////////////////////////////////// -// SCP 294 // -// // -// This is a child of a chemistry // -// dispenser. Info of how it works at // -// http://www.scp-wiki.net/scp-294 // -// // -////////////////////////////////////////// - -/obj/machinery/chem_dispenser/scp_294 - name = "\improper strange coffee machine" - desc = "It appears to be a standard coffee vending machine, the only noticeable difference being an entry touchpad with buttons corresponding to a Galactic Common QWERTY keyboard." - icon = 'icons/obj/scp.dmi' - icon_state = "294_bottom" - amount = 10 - resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF - working_state = null - nopower_state = null - flags_1 = NODECONSTRUCT_1 - var/static/list/shortcuts = list( - "meth" = "methamphetamine", - "tricord" = "tricordrazine" - ) - var/mutable_appearance/top_overlay - -/obj/machinery/chem_dispenser/scp_294/Initialize() - . = ..() - GLOB.poi_list += src - top_overlay = mutable_appearance(icon, "294_top", layer = ABOVE_ALL_MOB_LAYER) - update_icon() - - -/obj/machinery/chem_dispenser/scp_294/update_icon() - cut_overlays() - add_overlay(top_overlay) - -/obj/machinery/chem_dispenser/scp_294/Destroy() - . = ..() - GLOB.poi_list -= src - QDEL_NULL(top_overlay) - -/obj/machinery/chem_dispenser/scp_294/display_beaker() - return - -/obj/machinery/chem_dispenser/scp_294/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ - datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "scp_294", name, 390, 315, master_ui, state) - ui.open() - -/obj/machinery/chem_dispenser/scp_294/ui_act(action, params) - if(..()) - return - update_icon() - switch(action) - if("ejectBeaker") - if(beaker) - beaker.forceMove(drop_location()) - if(Adjacent(usr) && !issilicon(usr)) - usr.put_in_hands(beaker) - beaker = null - . = TRUE - if("input") - var/input_reagent = replacetext(lowertext(input("Enter the name of any liquid", "Input") as text), " ", "") //95% of the time, the reagent id is a lowercase/no spaces version of the name - if(shortcuts[input_reagent]) - input_reagent = shortcuts[input_reagent] - else - input_reagent = find_reagent(input_reagent) - if(!input_reagent || !GLOB.chemical_reagents_list[input_reagent]) - say("OUT OF RANGE") - return - else - if(!beaker) - return - else if(!beaker.reagents && !QDELETED(beaker)) - beaker.create_reagents(beaker.volume) - beaker.reagents.add_reagent(input_reagent, amount) - if("makecup") - if(beaker) - return - beaker = new /obj/item/reagent_containers/food/drinks/sillycup(src) - visible_message("[src] dispenses a small, paper cup.") - -/obj/machinery/chem_dispenser/scp_294/proc/find_reagent(input) - . = FALSE - if(GLOB.chemical_reagents_list[input]) //prefer IDs! - var/datum/reagent/R = GLOB.chemical_reagents_list[input] - if(R.can_synth) - return input - else - for(var/X in GLOB.chemical_reagents_list) - var/datum/reagent/R = GLOB.chemical_reagents_list[X] - if(R.can_synth && input == replacetext(lowertext(R.name), " ", "")) - return X diff --git a/config/spaceRuinBlacklist.txt b/config/spaceRuinBlacklist.txt index f70d5ceea7..628e08f8f1 100644 --- a/config/spaceRuinBlacklist.txt +++ b/config/spaceRuinBlacklist.txt @@ -37,7 +37,6 @@ #_maps/RandomRuins/SpaceRuins/oldteleporter.dmm #_maps/RandomRuins/SpaceRuins/onehalf.dmm #_maps/RandomRuins/SpaceRuins/originalcontent.dmm -#_maps/RandomRuins/SpaceRuins/scp_294.dmm #_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm #_maps/RandomRuins/SpaceRuins/spacehotel.dmm #_maps/RandomRuins/SpaceRuins/thederelict.dmm diff --git a/icons/obj/scp.dmi b/icons/obj/scp.dmi deleted file mode 100644 index 0b525a4332..0000000000 Binary files a/icons/obj/scp.dmi and /dev/null differ diff --git a/tgstation.dme b/tgstation.dme index 5e793c7e16..02e753a304 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2331,7 +2331,6 @@ #include "code\modules\reagents\chemistry\machinery\chem_master.dm" #include "code\modules\reagents\chemistry\machinery\pandemic.dm" #include "code\modules\reagents\chemistry\machinery\reagentgrinder.dm" -#include "code\modules\reagents\chemistry\machinery\scp_294.dm" #include "code\modules\reagents\chemistry\machinery\smoke_machine.dm" #include "code\modules\reagents\chemistry\reagents\alcohol_reagents.dm" #include "code\modules\reagents\chemistry\reagents\blob_reagents.dm" diff --git a/tgui/src/interfaces/scp_294.ract b/tgui/src/interfaces/scp_294.ract deleted file mode 100644 index e0b302bf0c..0000000000 --- a/tgui/src/interfaces/scp_294.ract +++ /dev/null @@ -1,21 +0,0 @@ - - - Eject - Input - Create Cup - - - - - {{#if data.isBeakerLoaded}} - {{Math.round(adata.beakerCurrentVolume)}}/{{data.beakerMaxVolume}} Units - {{#each adata.beakerContents}} - {{Math.fixed(volume, 2)}} units of {{name}}
- {{else}} - Recipient Empty - {{/each}} - {{else}} - No Recipient - {{/if}} - - \ No newline at end of file