From f0bf81cb1f2e8b24c2bbd4ed6960d45e06cd75d8 Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 13 Oct 2020 06:10:12 -0300 Subject: [PATCH 01/18] Runtimes and balance --- code/__HELPERS/radiation.dm | 4 +++- code/datums/components/radioactive.dm | 7 ++++--- code/modules/mob/living/simple_animal/astral.dm | 1 + code/modules/power/singularity/collector.dm | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/radiation.dm b/code/__HELPERS/radiation.dm index 8c34ce35..d527d0ac 100644 --- a/code/__HELPERS/radiation.dm +++ b/code/__HELPERS/radiation.dm @@ -13,7 +13,8 @@ var/list/processing_list = list(location) . = list() var/i = 0 - while(i < length(processing_list)) + var/lim = 1 + while(i < lim) var/atom/thing = processing_list[++i] if(ignored_things[thing.type]) continue @@ -21,6 +22,7 @@ if((thing.rad_flags & RAD_PROTECT_CONTENTS) || (SEND_SIGNAL(thing, COMSIG_ATOM_RAD_PROBE) & COMPONENT_BLOCK_RADIATION)) continue processing_list += thing.contents + lim = processing_list.len /proc/radiation_pulse(atom/source, intensity, range_modifier, log=FALSE, can_contaminate=TRUE) if(!SSradiation.can_fire) diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm index b823c705..64bc3765 100644 --- a/code/datums/components/radioactive.dm +++ b/code/datums/components/radioactive.dm @@ -34,12 +34,13 @@ var/atom/movable/master = parent master.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#39ff1430", "size" = 2)) addtimer(CALLBACK(src, .proc/glow_loop, master), rand(1,19))//Things should look uneven + START_PROCESSING(SSradiation, src) /datum/component/radioactive/Destroy() + STOP_PROCESSING(SSradiation, src) var/atom/movable/master = parent master.remove_filter("rad_glow") - STOP_PROCESSING(SSradiation, src) return ..() /datum/component/radioactive/process() @@ -60,7 +61,7 @@ animate(filter, alpha = 110, time = 15, loop = -1) animate(alpha = 40, time = 25) -/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original, _strength, _source, _half_life, _can_contaminate) +/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original, list/arguments) if(!i_am_original) return if(!hl3_release_date) // Permanently radioactive things don't get to grow stronger @@ -69,7 +70,7 @@ var/datum/component/radioactive/other = C strength = max(strength, other.strength) else - strength = max(strength, _strength) + strength = max(strength, arguments[1]) /datum/component/radioactive/proc/rad_examine(datum/source, mob/user, list/examine_list) var/atom/master = parent diff --git a/code/modules/mob/living/simple_animal/astral.dm b/code/modules/mob/living/simple_animal/astral.dm index 9bac53ef..8c261157 100644 --- a/code/modules/mob/living/simple_animal/astral.dm +++ b/code/modules/mob/living/simple_animal/astral.dm @@ -20,6 +20,7 @@ alpha = 50 attacktext = "touches the mind of" speak_emote = list("echos") + rad_flags = RAD_NO_CONTAMINATE movement_type = FLYING var/pseudo_death = FALSE var/posses_safe = FALSE diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 021b5fea..018a16e4 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -1,5 +1,5 @@ // stored_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT -#define RAD_COLLECTOR_EFFICIENCY 80 // radiation needs to be over this amount to get power +#define RAD_COLLECTOR_EFFICIENCY 60 // radiation needs to be over this amount to get power #define RAD_COLLECTOR_COEFFICIENT 100 #define RAD_COLLECTOR_STORED_OUT 0.04 // (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source #define RAD_COLLECTOR_MINING_CONVERSION_RATE 0.00001 //This is gonna need a lot of tweaking to get right. This is the number used to calculate the conversion of watts to research points per process() From 0b29c76fe50f5a5a4835e221e15e72f16ee63304 Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 13 Oct 2020 12:54:14 -0300 Subject: [PATCH 02/18] alt click --- code/game/machinery/_machinery.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 32a20c51..938a4d92 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -570,6 +570,7 @@ Class Procs: updateUsrDialog() /obj/machinery/AltClick(mob/user) + . = ..() if(!user.canUseTopic(src, !issilicon(user)) || !is_operational()) return if(inserted_modify_id) From 417a0d9d4a7b7f3f6613521d205ce1824449fa84 Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 13 Oct 2020 14:55:34 -0300 Subject: [PATCH 03/18] Jukeboxes Finally Work --- code/controllers/subsystem/jukeboxes.dm | 10 ++++++---- code/game/machinery/dance_machine.dm | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/jukeboxes.dm b/code/controllers/subsystem/jukeboxes.dm index b43f50d8..2c24262a 100644 --- a/code/controllers/subsystem/jukeboxes.dm +++ b/code/controllers/subsystem/jukeboxes.dm @@ -65,6 +65,7 @@ SUBSYSTEM_DEF(jukeboxes) /datum/controller/subsystem/jukeboxes/Initialize() var/list/tracks = flist("config/jukebox_music/sounds/") + var/songID = 1 for(var/S in tracks) var/datum/track/T = new() T.song_path = file("config/jukebox_music/sounds/[S]") @@ -72,8 +73,9 @@ SUBSYSTEM_DEF(jukeboxes) T.song_name = L[1] T.song_length = text2num(L[2]) T.song_beat = text2num(L[3]) - T.song_associated_id = L[4] + T.song_associated_id = songID songs |= T + songID++ for(var/i in CHANNEL_JUKEBOX_START to CHANNEL_JUKEBOX) freejukeboxchannels |= i return ..() @@ -83,15 +85,15 @@ SUBSYSTEM_DEF(jukeboxes) return for(var/list/jukeinfo in activejukeboxes) if(!jukeinfo.len) - EXCEPTION("Active jukebox without any associated metadata.") + stack_trace("Active jukebox without any associated metadata.") continue var/datum/track/juketrack = jukeinfo[1] if(!istype(juketrack)) - EXCEPTION("Invalid jukebox track datum.") + stack_trace("Invalid jukebox track datum.") continue var/obj/jukebox = jukeinfo[3] if(!istype(jukebox)) - EXCEPTION("Nonexistant or invalid object associated with jukebox.") + stack_trace("Nonexistant or invalid object associated with jukebox.") continue var/sound/song_played = sound(juketrack.song_path) var/area/currentarea = get_area(jukebox) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 78eff08e..0fdcc12a 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -202,6 +202,8 @@ for(var/i in 1 to 10) spawn_atom_to_turf(/obj/effect/temp_visual/hierophant/telegraph/edge, src, 1, FALSE) sleep(5) + if(QDELETED(src)) + return #define DISCO_INFENO_RANGE (rand(85, 115)*0.01) @@ -364,7 +366,7 @@ //for(var/mob/living/carbon/NS in rangers) // NS.resting = !NS.resting // NS.update_canmove() - time-- + time-- /obj/machinery/jukebox/disco/proc/dance5(var/mob/living/M) animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0) From 8deb2eb4a7bf01c0089ff00e61e4e8be64531f35 Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 13 Oct 2020 15:47:36 -0300 Subject: [PATCH 04/18] Fixes dance proc! --- code/game/machinery/dance_machine.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 0fdcc12a..a5365127 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -432,6 +432,14 @@ /obj/machinery/jukebox/disco/process() . = ..() if(active) - for(var/mob/M in rangers) + for(var/mob/living/M in range(10,src)) + if(!M.client || !(M.client.prefs.toggles & SOUND_INSTRUMENTS)) + continue + if(!(M in rangers)) + rangers += M + for(var/mob/living/M in rangers) + if(get_dist(src,M) > 10) + rangers -= M + for(var/mob/living/M in rangers) if(prob(5+(allowed(M)*4)) && M.canmove) dance(M) From 1becf6f486a3a025613930c19fe4c96c67770422 Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 13 Oct 2020 16:46:36 -0300 Subject: [PATCH 05/18] turrets no longer target megafauna. --- code/game/machinery/porta_turret/portable_turret.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index e20c991c..1a9922d6 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -369,7 +369,7 @@ if(check_anomalies)//if it's set to check for simple animals if(isanimal(A)) var/mob/living/simple_animal/SA = A - if(SA.stat || in_faction(SA)) //don't target if dead or in faction + if(SA.stat || in_faction(SA) || istype(SA, /mob/living/simple_animal/hostile/megafauna)) //don't target if dead or in faction continue targets += SA if(issilicon(A)) From ee668a8824c482f9b8c7818a41d7f478f281ef7e Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 13 Oct 2020 17:00:46 -0300 Subject: [PATCH 06/18] Lavaland Syndicate outdoor area change --- .../lavaland_surface_syndicate_base1.dmm | 54 +++++++++---------- code/game/area/areas/ruins/lavaland.dm | 5 +- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 3071661b..556bc6d0 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -1,6 +1,6 @@ -"aa" = (/turf/template_noop,/area/template_noop) -"ab" = (/turf/open/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors) -"ac" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"aa" = (/turf/template_noop,/area/ruin/unpowered/syndicate_lava_base/outdoors) +"ab" = (/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) +"ac" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "ad" = (/obj/machinery/porta_turret/syndicate{dir = 9},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) "ae" = (/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/testlab) "af" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) @@ -19,13 +19,13 @@ "as" = (/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/chemistry) "at" = (/obj/structure/grille,/obj/structure/window/plastitanium,/obj/machinery/door/poddoor{id = "lavalandsyndi_chemistry"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/chemistry) "au" = (/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/arrivals) -"av" = (/obj/structure/flora/rock/pile,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"av" = (/obj/structure/flora/rock/pile,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "aw" = (/obj/machinery/camera{c_tag = "Xenobiology Inner South"; dir = 4; network = list("ss13","rd")},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab) "ax" = (/obj/structure/table/reinforced,/obj/machinery/camera{c_tag = "Xenobiology Inner South"; dir = 4; network = list("ss13","rd")},/obj/item/extinguisher,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab) "ay" = (/obj/machinery/porta_turret/syndicate{dir = 10},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) "az" = (/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab) "aA" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab) -"aB" = (/obj/machinery/porta_turret/syndicate{dir = 8},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) +"aB" = (/obj/machinery/porta_turret/syndicate{dir = 8},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/outdoors) "aC" = (/obj/machinery/porta_turret/syndicate{dir = 4},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) "aD" = (/obj/structure/closet/secure_closet/medical1{req_access = null; req_access_txt = "150"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/defibrillator/compact/combat,/turf/open/floor/plasteel/white/side{dir = 9},/area/ruin/unpowered/syndicate_lava_base/medbay) "aE" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/telecomms) @@ -46,10 +46,10 @@ "aT" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/testlab) "aU" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/testlab) "aV" = (/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) -"aW" = (/obj/structure/lattice/catwalk,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"aW" = (/obj/structure/lattice/catwalk,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "aX" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1; external_pressure_bound = 140; name = "killroom vent"; pressure_checks = 0},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/testlab) "aY" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/turf_decal/stripes/red/box,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab) -"aZ" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 8},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"aZ" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 8},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "ba" = (/mob/living/simple_animal/slime,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab) "bb" = (/obj/structure/table/glass,/obj/machinery/light/small{dir = 8},/obj/item/clothing/glasses/science,/obj/item/clothing/mask/gas,/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab) "bc" = (/obj/structure/chair/office/light{dir = 1},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab) @@ -121,17 +121,17 @@ "cr" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/machinery/chem_heater,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/chemistry) "cs" = (/obj/structure/chair/office/light{dir = 1},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/chemistry) "ct" = (/obj/structure/grille,/obj/structure/window/plastitanium,/obj/machinery/door/poddoor/preopen{id = "lavalandsyndi_virology"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/virology) -"cx" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) +"cx" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) "cy" = (/obj/effect/decal/cleanable/dirt,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/circuits) "cz" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "cA" = (/obj/effect/turf_decal/stripes/line{dir = 6},/obj/structure/closet/crate/bin,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/chemistry) "cB" = (/obj/machinery/light/small{dir = 1},/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "cC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/circuits) "cD" = (/obj/structure/cable/yellow{icon_state = "2-8"},/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay) -"cE" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) -"cF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) +"cE" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) +"cF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) "cG" = (/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/disposaloutlet{dir = 1},/obj/structure/window/plasma/reinforced,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab) -"cH" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) +"cH" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) "cI" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/extinguisher_cabinet{pixel_y = -29},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/circuits) "cJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-4"},/turf/open/floor/plasteel/white/side{dir = 1},/area/ruin/unpowered/syndicate_lava_base/circuits) "cK" = (/obj/structure/cable/yellow{icon_state = "0-8"},/obj/machinery/power/apc/syndicate{dir = 1; name = "Circuit Lab APC"; pixel_y = 24},/turf/open/floor/plasteel/white/side{dir = 1},/area/ruin/unpowered/syndicate_lava_base/circuits) @@ -181,7 +181,7 @@ "dD" = (/obj/structure/window/reinforced,/obj/effect/turf_decal/stripes/corner{dir = 4},/obj/machinery/airalarm/syndicate{dir = 4; pixel_x = -24},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab) "dE" = (/obj/structure/table/glass,/obj/item/stack/sheet/mineral/plasma{amount = 5; pixel_x = -2; pixel_y = 6},/obj/item/stack/sheet/mineral/plasma{amount = 5; pixel_y = 2},/obj/item/stack/sheet/mineral/plasma{amount = 5; pixel_x = 2; pixel_y = -2},/obj/effect/decal/cleanable/dirt,/obj/item/reagent_containers/glass/bottle/charcoal{pixel_x = 6},/obj/item/reagent_containers/glass/bottle/epinephrine,/turf/open/floor/plasteel/white/corner{dir = 4},/area/ruin/unpowered/syndicate_lava_base/chemistry) "dF" = (/obj/effect/turf_decal/box/white/corners{dir = 8},/obj/structure/closet/crate,/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 1},/obj/item/bluespace_thread{pixel_x = -7; pixel_y = 7},/obj/item/bluespace_thread{pixel_x = -5; pixel_y = 5},/obj/item/bluespace_thread{pixel_x = -3; pixel_y = 3},/obj/item/bluespace_thread{pixel_x = -1; pixel_y = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/cargo) -"dG" = (/obj/structure/lattice/catwalk,/turf/open/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors) +"dG" = (/obj/structure/lattice/catwalk,/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "dH" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/cargo) "dI" = (/obj/structure/table/glass,/obj/machinery/reagentgrinder{pixel_y = 5},/obj/item/reagent_containers/glass/beaker/large,/turf/open/floor/plasteel/white/side{dir = 5},/area/ruin/unpowered/syndicate_lava_base/chemistry) "dJ" = (/obj/machinery/hydroponics/constructable,/obj/structure/window/reinforced{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) @@ -262,7 +262,7 @@ "fg" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 10},/turf/open/floor/plasteel/white/side{dir = 6},/area/ruin/unpowered/syndicate_lava_base/virology) "fh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 4},/turf/open/floor/plasteel/white/side{dir = 10},/area/ruin/unpowered/syndicate_lava_base/virology) "fi" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories) -"fj" = (/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) +"fj" = (/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) "fk" = (/obj/machinery/light/small,/obj/structure/extinguisher_cabinet{pixel_y = -29},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side,/area/ruin/unpowered/syndicate_lava_base/medbay) "fl" = (/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 5},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "fm" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical{name = "Chemistry Lab"; req_access_txt = "150"},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/chemistry) @@ -318,7 +318,7 @@ "gl" = (/obj/structure/grille,/obj/structure/window/plastitanium,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor{id = "lavalandsyndi_circuits"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/circuits) "gm" = (/obj/structure/reagent_dispensers/watertank/high,/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/machinery/light/small,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "gn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 6},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/engineering) -"go" = (/obj/structure/flora/rock/pile,/obj/structure/flora/junglebush/c,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"go" = (/obj/structure/flora/rock/pile,/obj/structure/flora/junglebush/c,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "gp" = (/obj/machinery/hydroponics/constructable,/obj/structure/window/reinforced{dir = 8},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "gq" = (/obj/machinery/hydroponics/constructable,/obj/structure/window/reinforced{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "gr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/virology) @@ -404,31 +404,31 @@ "hW" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/door/airlock/medical/glass{dir = 4; name = "Medbay"},/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/medbay) "hX" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical/glass{dir = 4; name = "Medbay"},/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/medbay) "hY" = (/obj/machinery/button/door{id = "lavalandsyndi_arrivals"; name = "Arrivals Blast Door Control"; pixel_y = -26; req_access_txt = "150"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/machinery/light/small,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"hZ" = (/obj/structure/flora/rock,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"hZ" = (/obj/structure/flora/rock,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "ia" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) "ib" = (/obj/effect/mob_spawn/human/lavaland_syndicate{dir = 4; icon_state = "sleeper_s"},/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories) "ic" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories) "id" = (/obj/structure/toilet{pixel_y = 18},/obj/structure/sink{dir = 4; pixel_x = 11},/obj/machinery/light/small{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/dormitories) "ie" = (/obj/effect/mob_spawn/human/lavaland_syndicate/comms{dir = 8; icon_state = "sleeper_s"},/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories) "if" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) -"ig" = (/obj/structure/flora/grass/jungle,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"ih" = (/obj/structure/flora/rock/pile,/obj/structure/flora/grass/jungle/b,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"ii" = (/obj/structure/flora/rock/jungle,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"ij" = (/obj/structure/flora/grass/jungle/b,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"ig" = (/obj/structure/flora/grass/jungle,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) +"ih" = (/obj/structure/flora/rock/pile,/obj/structure/flora/grass/jungle/b,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) +"ii" = (/obj/structure/flora/rock/jungle,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) +"ij" = (/obj/structure/flora/grass/jungle/b,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "ik" = (/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) "il" = (/obj/machinery/door/airlock{name = "Cabin 2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories) "im" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/dormitories) "in" = (/obj/machinery/door/airlock{name = "Cabin 4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories) -"io" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"io" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "ip" = (/obj/effect/turf_decal/stripes/red/corner,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) "iq" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) "ir" = (/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/stripes/red/line{dir = 9},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/main) "is" = (/obj/machinery/light/small{dir = 1},/obj/machinery/turretid{ailock = 1; control_area = "/area/ruin/unpowered/syndicate_lava_base/main"; dir = 1; icon_state = "control_kill"; lethal = 1; name = "Base turret controls"; pixel_y = 30; req_access = null; req_access_txt = "150"},/turf/open/floor/circuit/red,/area/ruin/unpowered/syndicate_lava_base/main) "it" = (/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/stripes/red/line{dir = 5},/obj/structure/filingcabinet,/obj/item/folder/syndicate/mining,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/main) -"iu" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) -"iv" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) -"iw" = (/obj/structure/lattice/catwalk,/obj/structure/flora/junglebush{pixel_x = -15},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"ix" = (/obj/structure/flora/junglebush/c{pixel_y = 15},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"iu" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) +"iv" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) +"iw" = (/obj/structure/lattice/catwalk,/obj/structure/flora/junglebush{pixel_x = -15},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) +"ix" = (/obj/structure/flora/junglebush/c{pixel_y = 15},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "iy" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/structure/closet{name = "Hydroponics locker"},/obj/item/storage/box/disks_plantgene,/obj/item/storage/box/disks_plantgene,/obj/item/hatchet,/obj/item/hatchet,/obj/item/watertank,/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/obj/item/storage/bag/plants,/obj/item/storage/bag/plants,/obj/item/plant_analyzer,/obj/item/plant_analyzer,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "iz" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories) "iA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories) @@ -461,7 +461,7 @@ "jh" = (/obj/machinery/door/airlock{name = "Cabin 3"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/dormitories) "ji" = (/obj/structure/cable/yellow{icon_state = "0-2"},/obj/machinery/power/apc/syndicate{dir = 8; name = "Primary Hallway APC"; pixel_x = -24},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) "jj" = (/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) -"jk" = (/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) +"jk" = (/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) "jl" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) "jm" = (/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) "jn" = (/obj/effect/mob_spawn/human/lavaland_syndicate{dir = 4; icon_state = "sleeper_s"},/obj/machinery/airalarm/syndicate{pixel_y = 24},/turf/open/floor/plasteel/grimy,/area/ruin/unpowered/syndicate_lava_base/dormitories) @@ -568,8 +568,8 @@ "ls" = (/obj/machinery/atmospherics/pipe/simple/supply/visible,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "lt" = (/obj/machinery/atmospherics/pipe/simple/supplymain/visible,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "lu" = (/obj/machinery/light/small{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) -"lv" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) -"lw" = (/obj/effect/turf_decal/stripes/line,/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors) +"lv" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) +"lw" = (/obj/effect/turf_decal/stripes/line,/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) "lx" = (/obj/structure/bookcase/random,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "ly" = (/obj/structure/chair/stool/bar,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "lz" = (/obj/structure/table/wood,/obj/item/reagent_containers/rag{pixel_x = -4; pixel_y = 9},/obj/item/reagent_containers/food/drinks/beer{pixel_x = 5; pixel_y = -2},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood,/area/ruin/unpowered/syndicate_lava_base/bar) diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index c4af7323..99245f71 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -76,6 +76,9 @@ /area/ruin/unpowered/syndicate_lava_base/circuits name = "Syndicate Lavaland Circuit Lab" +/area/ruin/unpowered/syndicate_lava_base/outdoors //Putting this area down should prevent fauna from spawning nearby + name = "Syndicate Lavaland Approach" + icon_state = "red" //Xeno Nest @@ -89,4 +92,4 @@ //ash walker nest /area/ruin/unpowered/ash_walkers - icon_state = "red" \ No newline at end of file + icon_state = "red" From 29e1f9ba2f74f9368b582b26daa8cf994f21d567 Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 13 Oct 2020 18:34:25 -0300 Subject: [PATCH 07/18] source --- code/datums/elements/cleaning.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/elements/cleaning.dm b/code/datums/elements/cleaning.dm index 02084a88..3e0c60ad 100644 --- a/code/datums/elements/cleaning.dm +++ b/code/datums/elements/cleaning.dm @@ -35,4 +35,4 @@ SEND_SIGNAL(cleaned_human, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) cleaned_human.wash_cream() cleaned_human.regenerate_icons() - to_chat(cleaned_human, "[src] cleans your face!") + to_chat(cleaned_human, "[AM] cleans your face!") From 1136f0f31a29492092679c430097bfcbdd094289 Mon Sep 17 00:00:00 2001 From: Archie Date: Wed, 14 Oct 2020 00:41:15 -0300 Subject: [PATCH 08/18] prevents off-z appendicitis --- code/modules/events/spontaneous_appendicitis.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index cb13be4b..dbbbbec3 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -15,6 +15,8 @@ continue if(H.stat == DEAD) continue + if(H.z != SSmapping.station_start) //Let's not fucking give Appendicitis to ghost roles or people not on station, shall we? + continue if(!H.getorgan(/obj/item/organ/appendix)) //Don't give the disease to some who lacks it, only for it to be auto-cured continue if(!(MOB_ORGANIC in H.mob_biotypes)) //biotype sleeper bugs strike again, once again making appendicitis pick a target that can't take it @@ -28,4 +30,4 @@ var/datum/disease/D = new /datum/disease/appendicitis() H.ForceContractDisease(D, FALSE, TRUE) - break \ No newline at end of file + break From 591c1675b4b88ab6b9c563fb0654c304bfb4ff65 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 14 Jan 2020 00:33:47 +0100 Subject: [PATCH 09/18] Merge pull request #10552 from Tupinambis/NotUglyFireAlarms Pseudo Reverts Fire Alarms Back to Original Look: AKA Not Fuckugly --- icons/obj/monitors.dmi | Bin 14235 -> 15106 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi index 93a1908fba705a0acf81abc1c74517109da7a7ae..5e91660e879f61ce081da9955c47a16a5ba17192 100644 GIT binary patch literal 15106 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 From e20b215597155f72bfaa8700e83fcacc1609da65 Mon Sep 17 00:00:00 2001 From: Archie Date: Wed, 14 Oct 2020 17:25:53 -0300 Subject: [PATCH 10/18] code fuck up --- code/game/objects/effects/landmarks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 9754b4f4..68a5d34e 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -456,7 +456,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) if(!SSmapping.station_room_templates[t]) log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list") templates -= t - template_name = pickweight(templates) + template_name = pickweightAllowZero(templates) // did you know: pickweightAllowZero is the one that DISALLOWS zero? fun fact. if(!template_name) GLOB.stationroom_landmarks -= src qdel(src) From f6c0bf946bc09de055e4ea7b42f494b362e8bfc0 Mon Sep 17 00:00:00 2001 From: Archie Date: Wed, 14 Oct 2020 17:44:43 -0300 Subject: [PATCH 11/18] prob change (was this ever working?) --- code/modules/ruins/lavaland_ruin_code.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 3ea7fa59..4c01c408 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -148,7 +148,7 @@ /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space/Initialize() . = ..() - if(prob(90)) //only has a 10% chance of existing, otherwise it'll just be a NPC syndie. + if(prob(50)) //only has a 10% chance of existing, otherwise it'll just be a NPC syndie. new /mob/living/simple_animal/hostile/syndicate/ranged(get_turf(src)) return INITIALIZE_HINT_QDEL From 618175ab42b45470f4f780e8fc98295e5b78fbdf Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 15 Oct 2020 00:10:39 -0300 Subject: [PATCH 12/18] PAI redundancy --- code/modules/mob/living/silicon/pai/pai_defense.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index d1dd8602..5ac84132 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -69,7 +69,8 @@ emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth) if(emitterhealth < 0) fold_in(force = TRUE) - to_chat(src, "The impact degrades your holochassis!") + if(amount > 0) + to_chat(src, "The impact degrades your holochassis!") return amount /mob/living/silicon/pai/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE) @@ -87,8 +88,11 @@ /mob/living/silicon/pai/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE) return FALSE -/mob/living/silicon/pai/adjustStaminaLoss(amount) - take_holo_damage(amount & 0.25) +/mob/living/silicon/pai/adjustStaminaLoss(amount, updating_health, forced = FALSE) + if(forced) + take_holo_damage(amount) + else + take_holo_damage(amount * 0.25) /mob/living/silicon/pai/adjustOrganLoss(slot, amount, maximum = 500) //I kept this in, unlike tg Knockdown(amount * 0.2) From b3a7a951238339ca7f2fbd62909771493b60b111 Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 15 Oct 2020 14:06:04 -0300 Subject: [PATCH 13/18] THE PLAYING CARDS, MASON, I FORGOT THE PLAYING CARDS --- _maps/RandomRuins/SpaceRuins/listeningstation.dmm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 3e6fc530..f3cd8dbc 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -1077,8 +1077,18 @@ /area/ruin/space/has_grav/listeningstation) "bD" = ( /obj/structure/table/wood, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/paper/fluff/ruins/listeningstation/briefing, +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/item/paper/fluff/ruins/listeningstation/briefing{ + pixel_x = -7; + pixel_y = -3 + }, +/obj/item/toy/cards/deck/syndicate{ + pixel_x = -6; + pixel_y = 11 + }, /turf/open/floor/plasteel/grimy, /area/ruin/space/has_grav/listeningstation) "bF" = ( From d4211fa3de3337be9dadbfeb03ad1402d1d469c4 Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 15 Oct 2020 14:30:50 -0300 Subject: [PATCH 14/18] unknown types, dna manip --- .../SpaceRuins/listeningstation.dmm | 157 ++++++++++-------- _maps/map_files/BoxStation/BoxStation.dmm | 2 +- 2 files changed, 92 insertions(+), 67 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index f3cd8dbc..49020b3d 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -524,11 +524,11 @@ }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/lights/bulbs, /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, -/obj/item/stock_parts/cell/high/plus, +/obj/item/storage/box/lights/bulbs, +/obj/item/storage/box/stockparts/deluxe, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "aP" = ( @@ -1157,6 +1157,15 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/ruin/space/has_grav/listeningstation) +"fp" = ( +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav/listeningstation) "fs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -1164,12 +1173,8 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "fJ" = ( -/obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, +/obj/machinery/biogenerator, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "hJ" = ( @@ -1216,17 +1221,14 @@ req_access = null; req_access_txt = "150" }, +/obj/item/storage/box/beakers/bluespace, /turf/open/floor/plasteel/white/side{ dir = 6 }, /area/ruin/space/has_grav/listeningstation) "tU" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/machinery/microwave, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "ux" = ( @@ -1272,44 +1274,28 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "Bd" = ( -/obj/machinery/vending/hydroseeds{ - slogan_delay = 700 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/machinery/smartfridge/disks{ + pixel_x = -4; + pixel_y = 11 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "Bs" = ( /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "DC" = ( -/obj/machinery/airalarm/syndicate{ - dir = 1; - pixel_y = -25 +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 }, -/obj/structure/table, -/obj/item/kitchen/rollingpin{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/machinery/reagentgrinder/constructed, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "DL" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -4; - pixel_y = 14 - }, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ - pixel_x = -3 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 3; - pixel_y = 11 - }, -/obj/item/lighter/slime{ - pixel_x = 6 - }, +/obj/structure/chair/stool, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "Et" = ( @@ -1334,7 +1320,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/computer/arcade/orion_trail, +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 4 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "Lx" = ( @@ -1345,6 +1337,53 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "Mh" = ( +/obj/machinery/airalarm/syndicate{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/table, +/obj/item/kitchen/rollingpin{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/machinery/reagentgrinder/constructed, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav/listeningstation) +"Ns" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/machinery/plantgenes{ + pixel_y = 6 + }, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav/listeningstation) +"NQ" = ( +/obj/item/mop/advanced{ + pixel_x = -11 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating, +/area/ruin/space/has_grav/listeningstation) +"OI" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = -4; + pixel_y = 14 + }, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 3; + pixel_y = 11 + }, +/obj/item/lighter/slime{ + pixel_x = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav/listeningstation) +"Qp" = ( /obj/structure/table, /obj/item/storage/box/donkpockets{ pixel_x = -2; @@ -1362,23 +1401,6 @@ }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) -"Ns" = ( -/obj/machinery/biogenerator, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/listeningstation) -"NQ" = ( -/obj/item/mop/advanced{ - pixel_x = -11 - }, -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/plating, -/area/ruin/space/has_grav/listeningstation) -"Qp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/seed_extractor, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/listeningstation) "QM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -1387,9 +1409,12 @@ pixel_x = 5; pixel_y = 5 }, -/obj/structure/chair/stool, +/obj/machinery/computer/arcade/orion_trail, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) +"Sk" = ( +/turf/closed/wall, +/area/ruin/unpowered/no_grav) "TK" = ( /obj/machinery/chem_master/condimaster, /turf/open/floor/plasteel, @@ -1937,7 +1962,7 @@ ac ac ac ac -ab +Sk ab ab ab @@ -1976,6 +2001,7 @@ Bd Ns fJ DC +Mh ac ab ab @@ -1996,7 +2022,6 @@ ab ab ab ab -ab aa "} (16,1,1) = {" @@ -2013,9 +2038,10 @@ ac zq Gb XM -Qp Bs -Mh +tU +Bs +Qp ac ab ab @@ -2036,7 +2062,6 @@ ab ab ab ab -ab aa "} (17,1,1) = {" @@ -2055,7 +2080,8 @@ XM Bs fs za -tU +Bs +fp ac ab ab @@ -2076,7 +2102,6 @@ ab ab ab ab -ab aa "} (18,1,1) = {" @@ -2096,6 +2121,7 @@ Bs IH QM DL +OI ac ab ab @@ -2116,7 +2142,6 @@ ab ab ab ab -ab aa "} (19,1,1) = {" diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 5a5826cb..2c4ae316 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -4602,7 +4602,7 @@ /turf/open/space, /area/solar/port/fore) "ajf" = ( -/obj/machinery/prisoner/gulag_teleporter, +/obj/machinery/gulag_teleporter, /turf/open/floor/plasteel, /area/security/processing) "ajg" = ( From 72212713acd84a13055233ba6cf5bdc9f36013cb Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 15 Oct 2020 14:38:08 -0300 Subject: [PATCH 15/18] motherfucker, okay, you get fixed walls. --- .../SpaceRuins/listeningstation.dmm | 121 +++++++++--------- 1 file changed, 59 insertions(+), 62 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 49020b3d..976ed246 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -827,7 +827,7 @@ /obj/structure/closet/firecloset/full{ anchored = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "bk" = ( /obj/effect/turf_decal/stripes/red/line{ @@ -1093,17 +1093,15 @@ /area/ruin/space/has_grav/listeningstation) "bF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/meter, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bH" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/meter, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bI" = ( @@ -1157,15 +1155,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/ruin/space/has_grav/listeningstation) -"fp" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/machinery/microwave, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/listeningstation) "fs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -1239,7 +1228,17 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) "uB" = ( -/turf/open/floor/plating, +/obj/machinery/airalarm/syndicate{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/table, +/obj/item/kitchen/rollingpin{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/machinery/reagentgrinder/constructed, +/turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "za" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -1331,40 +1330,35 @@ /area/ruin/space/has_grav/listeningstation) "Lx" = ( /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 5 }, /obj/effect/decal/cleanable/blood/drip, +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "Mh" = ( -/obj/machinery/airalarm/syndicate{ - dir = 1; - pixel_y = -25 - }, /obj/structure/table, -/obj/item/kitchen/rollingpin{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/machinery/reagentgrinder/constructed, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/listeningstation) -"Ns" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/machinery/plantgenes{ +/obj/item/storage/box/donkpockets{ + pixel_x = -2; pixel_y = 6 }, +/obj/item/storage/box/donkpockets{ + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2 + }, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -30 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) -"NQ" = ( -/obj/item/mop/advanced{ - pixel_x = -11 - }, -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/plating, -/area/ruin/space/has_grav/listeningstation) -"OI" = ( +"Nh" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/beer{ pixel_x = -4; @@ -1383,22 +1377,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) -"Qp" = ( +"Ns" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/storage/box/donkpockets{ - pixel_x = -2; +/obj/machinery/plantgenes{ pixel_y = 6 }, -/obj/item/storage/box/donkpockets{ - pixel_y = 3 +/turf/open/floor/plasteel, +/area/ruin/space/has_grav/listeningstation) +"NQ" = ( +/obj/item/mop/advanced{ + pixel_x = -11 }, -/obj/item/storage/box/donkpockets{ - pixel_x = 2 - }, -/obj/item/reagent_containers/food/snacks/chocolatebar, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -30 +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating, +/area/ruin/space/has_grav/listeningstation) +"Qp" = ( +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/machinery/microwave, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "QM" = ( @@ -1412,9 +1412,6 @@ /obj/machinery/computer/arcade/orion_trail, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) -"Sk" = ( -/turf/closed/wall, -/area/ruin/unpowered/no_grav) "TK" = ( /obj/machinery/chem_master/condimaster, /turf/open/floor/plasteel, @@ -1962,7 +1959,7 @@ ac ac ac ac -Sk +ac ab ab ab @@ -2001,7 +1998,7 @@ Bd Ns fJ DC -Mh +uB ac ab ab @@ -2041,7 +2038,7 @@ XM Bs tU Bs -Qp +Mh ac ab ab @@ -2081,7 +2078,7 @@ Bs fs za Bs -fp +Qp ac ab ab @@ -2121,7 +2118,7 @@ Bs IH QM DL -OI +Nh ac ab ab @@ -2443,7 +2440,7 @@ be ag ag ag -uB +ag Et NQ ag From 3200799f5613f75305710ef1eb5d50136b556483 Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 15 Oct 2020 14:40:21 -0300 Subject: [PATCH 16/18] ONE WHOLE FAN --- _maps/RandomRuins/SpaceRuins/listeningstation.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 976ed246..c124a462 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -159,6 +159,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/poweredfans, /obj/machinery/door/airlock/external{ id_tag = "syndie_listeningpost_external"; req_access_txt = "150" From 110c2b512efe1a12770401099bf43600bc66a173 Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 15 Oct 2020 17:07:04 -0300 Subject: [PATCH 17/18] holodeck buffers????? --- code/game/machinery/Sleeper.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index f165c0b6..99264b5b 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -36,12 +36,11 @@ RefreshParts() add_inital_chems() -/obj/machinery/sleeper/Destroy() - var/obj/item/reagent_containers/sleeper_buffer/buffer = new /obj/item/reagent_containers/sleeper_buffer(loc) +/obj/machinery/sleeper/on_deconstruction() + var/obj/item/reagent_containers/sleeper_buffer/buffer = new (loc) buffer.volume = reagents.maximum_volume buffer.reagents.maximum_volume = reagents.maximum_volume reagents.trans_to(buffer.reagents, reagents.total_volume) - ..() /obj/machinery/sleeper/proc/add_inital_chems() for(var/i in available_chems) From 6378761217ea13d3ce7e06372c979c4382d2bfef Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 12 Jan 2020 00:40:17 -0800 Subject: [PATCH 18/18] Merge pull request #10522 from Hatterhat/syndi-sleeper printable syndicate sleepers - this is blackmajors fault im not gonna lie --- code/game/machinery/Sleeper.dm | 4 ++-- .../items/circuitboards/machine_circuitboards.dm | 4 ++++ .../designs/machine_desings/machine_designs_medical.dm | 10 +++++++++- code/modules/research/techweb/all_nodes.dm | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 99264b5b..027458e3 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -371,7 +371,7 @@ /obj/machinery/sleeper/syndie/Initialize() . = ..() component_parts = list() - component_parts += new /obj/item/circuitboard/machine/sleeper(null) + component_parts += new /obj/item/circuitboard/machine/sleeper/syndie(null) component_parts += new /obj/item/stock_parts/matter_bin/super(null) component_parts += new /obj/item/stock_parts/manipulator/pico(null) component_parts += new /obj/item/stack/sheet/glass(null) @@ -382,7 +382,7 @@ /obj/machinery/sleeper/syndie/fullupgrade/Initialize() . = ..() component_parts = list() - component_parts += new /obj/item/circuitboard/machine/sleeper(null) + component_parts += new /obj/item/circuitboard/machine/sleeper/syndie(null) component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) component_parts += new /obj/item/stock_parts/manipulator/femto(null) component_parts += new /obj/item/stack/sheet/glass(null) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index c65c269a..5840fc5f 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -15,6 +15,10 @@ /obj/item/stock_parts/manipulator = 1, /obj/item/stock_parts/capacitor = 1) +/obj/item/circuitboard/machine/sleeper/syndie + name = "Syndicate Sleeper (Machine Board)" + build_path = /obj/machinery/sleeper/syndie + /obj/item/circuitboard/machine/vr_sleeper name = "VR Sleeper (Machine Board)" build_path = /obj/machinery/vr_sleeper diff --git a/code/modules/research/designs/machine_desings/machine_designs_medical.dm b/code/modules/research/designs/machine_desings/machine_designs_medical.dm index c4f0d842..7cb8a460 100644 --- a/code/modules/research/designs/machine_desings/machine_designs_medical.dm +++ b/code/modules/research/designs/machine_desings/machine_designs_medical.dm @@ -32,7 +32,15 @@ id = "sleeper" build_path = /obj/item/circuitboard/machine/sleeper departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING - category = list ("Medical Machinery") + category = list("Medical Machinery") + +/datum/design/board/syndiesleeper + name = "Machine Design (Syndicate Sleeper Board)" + desc = "The circuit board for a Syndicate sleeper, with controls inside." + id = "syndiesleeper" + build_path = /obj/item/circuitboard/machine/sleeper/syndie + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING + category = list("Medical Machinery") /datum/design/board/cryotube name = "Machine Design (Cryotube Board)" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index e61e92e7..9b97f75e 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1053,7 +1053,7 @@ display_name = "Illegal Technology" description = "Dangerous research used to create dangerous objects." prereq_ids = list("adv_engi", "adv_weaponry", "explosive_weapons") - design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor", "advanced_camera") + design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor", "advanced_camera", "syndiesleeper") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000) export_price = 5000 hidden = TRUE