From c44c8657737d418558b80ee27f036688b04ae5c4 Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 10 Mar 2022 14:33:34 -0500 Subject: [PATCH 1/5] kermit --- .../lavaland_surface_syndicate_base1.dmm | 109 +++++++++--------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index b56490670116..2af5376a1d07 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -145,6 +145,20 @@ }, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/arrivals) +"cb" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 30 + }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/machinery/oven, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "cg" = ( /obj/structure/table, /obj/item/paper_bin, @@ -3718,26 +3732,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/ruin/unpowered/syndicate_lava_base/bar) -"lk" = ( -/obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30 - }, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/food/drinks/shaker, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "ll" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5518,6 +5512,21 @@ }, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/main) +"zc" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/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, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/glass/mixbowl, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "zu" = ( /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; @@ -5657,10 +5666,6 @@ /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/bar) -"Er" = ( -/obj/machinery/griddle, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "Ev" = ( /obj/structure/filingcabinet/medical, /turf/open/floor/plasteel/dark, @@ -5767,20 +5772,6 @@ }, /turf/open/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/medbay) -"FD" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/glass/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, -/obj/item/kitchen/rollingpin, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "Gv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6326,6 +6317,14 @@ }, /turf/open/floor/circuit/telecomms, /area/ruin/unpowered/syndicate_lava_base/telecomms) +"Qc" = ( +/obj/machinery/griddle, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "Qg" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -6527,6 +6526,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/chemistry) +"Ty" = ( +/obj/structure/table/wood, +/obj/machinery/light/small, +/obj/structure/cable/yellow, +/obj/machinery/power/apc/syndicate{ + dir = 2; + name = "Bar APC"; + pixel_y = -23 + }, +/obj/item/paicard, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/book/manual/wiki/barman_recipes, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "TA" = ( /obj/machinery/door/airlock/public/glass{ name = "Dormitories" @@ -6733,18 +6746,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/chemistry) -"YQ" = ( -/obj/structure/table/wood, -/obj/machinery/light/small, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/syndicate{ - dir = 2; - name = "Bar APC"; - pixel_y = -23 - }, -/obj/item/paicard, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "Zi" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -7769,9 +7770,9 @@ jN jZ kJ yP -FD +zc eE -YQ +Ty jy jy nS @@ -7918,8 +7919,8 @@ jy nJ kq oK -lk -Er +cb +Qc lZ mx jy From 361ca5bf67a2d219b028f20d227c8c439c2898b1 Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 10 Mar 2022 14:33:47 -0500 Subject: [PATCH 2/5] Revert "kermit" This reverts commit c44c8657737d418558b80ee27f036688b04ae5c4. --- .../lavaland_surface_syndicate_base1.dmm | 109 +++++++++--------- 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 2af5376a1d07..b56490670116 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -145,20 +145,6 @@ }, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"cb" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30 - }, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/machinery/oven, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "cg" = ( /obj/structure/table, /obj/item/paper_bin, @@ -3732,6 +3718,26 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/ruin/unpowered/syndicate_lava_base/bar) +"lk" = ( +/obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 30 + }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/book/manual/wiki/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "ll" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5512,21 +5518,6 @@ }, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/main) -"zc" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/glass/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, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/glass/mixbowl, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "zu" = ( /obj/machinery/door/poddoor/preopen{ id = "lavalandsyndi"; @@ -5666,6 +5657,10 @@ /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/bar) +"Er" = ( +/obj/machinery/griddle, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "Ev" = ( /obj/structure/filingcabinet/medical, /turf/open/floor/plasteel/dark, @@ -5772,6 +5767,20 @@ }, /turf/open/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/medbay) +"FD" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/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, +/obj/item/kitchen/rollingpin, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "Gv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6317,14 +6326,6 @@ }, /turf/open/floor/circuit/telecomms, /area/ruin/unpowered/syndicate_lava_base/telecomms) -"Qc" = ( -/obj/machinery/griddle, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "Qg" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -6526,20 +6527,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/chemistry) -"Ty" = ( -/obj/structure/table/wood, -/obj/machinery/light/small, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/syndicate{ - dir = 2; - name = "Bar APC"; - pixel_y = -23 - }, -/obj/item/paicard, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/book/manual/wiki/barman_recipes, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "TA" = ( /obj/machinery/door/airlock/public/glass{ name = "Dormitories" @@ -6746,6 +6733,18 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/chemistry) +"YQ" = ( +/obj/structure/table/wood, +/obj/machinery/light/small, +/obj/structure/cable/yellow, +/obj/machinery/power/apc/syndicate{ + dir = 2; + name = "Bar APC"; + pixel_y = -23 + }, +/obj/item/paicard, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "Zi" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -7770,9 +7769,9 @@ jN jZ kJ yP -zc +FD eE -Ty +YQ jy jy nS @@ -7919,8 +7918,8 @@ jy nJ kq oK -cb -Qc +lk +Er lZ mx jy From b01828fa0517481bcccb2f1e662d081cae8bae8f Mon Sep 17 00:00:00 2001 From: maxion12345 Date: Sun, 20 Mar 2022 00:11:25 -0400 Subject: [PATCH 3/5] e --- .../mob/living/silicon/ai/decentralized/ai_data_core.dm | 3 +-- .../mob/living/silicon/ai/decentralized/projects/rgb.dm | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm b/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm index 8b07ea4cac5a..0a77732f6e3c 100644 --- a/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm +++ b/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm @@ -147,8 +147,6 @@ GLOBAL_VAR_INIT(primary_data_core, null) add_overlay(on_overlay) /obj/machinery/ai/data_core/proc/partytime() - if(TimerID) - return FALSE var/current_color = random_color() set_light(7, 3, current_color) TimerID = addtimer(CALLBACK(src, .proc/partytime), 0.5 SECONDS, TIMER_STOPPABLE) @@ -157,6 +155,7 @@ GLOBAL_VAR_INIT(primary_data_core, null) set_light(0) if(TimerID) deltimer(TimerID) + TimerID = null /obj/machinery/ai/data_core/primary name = "primary AI Data Core" desc = "A complicated computer system capable of emulating the neural functions of a human at near-instantanous speeds. This one has a scrawny and faded note saying: 'Primary AI Data Core'" diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm index 895b4ae2710c..8e57a2b4f4a9 100644 --- a/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm +++ b/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm @@ -11,7 +11,8 @@ if(!.) return . for(var/obj/machinery/ai/data_core/datacores in GLOB.data_cores) - datacores.partytime() + if(datacores.TimerID = null) + datacores.partytime() /datum/ai_project/rgb/stop() From 4cd21d837e1b7052d2ca5b5bad651b66f53f6d32 Mon Sep 17 00:00:00 2001 From: maxion12345 Date: Sun, 20 Mar 2022 00:41:40 -0400 Subject: [PATCH 4/5] obama last name is president --- .../modules/mob/living/silicon/ai/decentralized/projects/rgb.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm index 8e57a2b4f4a9..6cda5567921a 100644 --- a/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm +++ b/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm @@ -11,7 +11,7 @@ if(!.) return . for(var/obj/machinery/ai/data_core/datacores in GLOB.data_cores) - if(datacores.TimerID = null) + if(datacores.TimerID == null) datacores.partytime() From 54c90ed788d0bed46c80f7c6fae4402e653fe6e3 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Sun, 20 Mar 2022 11:46:14 +0100 Subject: [PATCH 5/5] Update code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm --- .../modules/mob/living/silicon/ai/decentralized/projects/rgb.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm index 6cda5567921a..e89a25e8a1ee 100644 --- a/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm +++ b/code/modules/mob/living/silicon/ai/decentralized/projects/rgb.dm @@ -11,7 +11,7 @@ if(!.) return . for(var/obj/machinery/ai/data_core/datacores in GLOB.data_cores) - if(datacores.TimerID == null) + if(!datacores.TimerID) datacores.partytime()