From 763c5ff195d2d4b3402379815971ce0d21e0b380 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 11 Jun 2022 01:11:17 -0700
Subject: [PATCH 01/28] Update client_procs.dm
---
code/modules/client/client_procs.dm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 5387e1e5c6..b927e83b2c 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -422,10 +422,12 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if( (world.address == address || !address) && !GLOB.host )
GLOB.host = key
world.update_status()
-
+
if(holder)
add_admin_verbs()
- to_chat(src, get_message_output("memo"))
+ var/admin_memo_note = get_message_output("memo")
+ if(admin_memo_note)
+ to_chat(src, get_message_output("memo"))
adminGreet()
add_verbs_from_config()
@@ -468,7 +470,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(CONFIG_GET(flag/autoconvert_notes))
convert_notes_sql(ckey)
- to_chat(src, get_message_output("message", ckey))
+ var/admin_message_note = get_message_output("message", ckey)
+ if(admin_message_note)
+ to_chat(src, admin_message_note)
if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them.
to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.")
From 578eb440c1ddda5353db7e8b95473a8f10e7d753 Mon Sep 17 00:00:00 2001
From: deathride58
Date: Wed, 20 Jul 2022 16:51:38 -0400
Subject: [PATCH 02/28] If you know, you know; fixes a decade-old typo,
essentially mirroring RP's typo fix
---
.../subsystem/persistence/poly_parrot.dm | 8 ++--
code/datums/diseases/parrotpossession.dm | 2 +-
code/modules/admin/chat_commands.dm | 10 ++---
code/modules/admin/topic.dm | 4 +-
.../bloodsucker/powers/mesmerize.dm | 2 +-
.../modules/awaymissions/super_secret_room.dm | 6 +--
code/modules/cargo/packs/engineering.dm | 2 +-
code/modules/events/holiday/halloween.dm | 6 +--
code/modules/mob/living/silicon/ai/ai.dm | 4 +-
.../mob/living/simple_animal/parrot.dm | 40 +++++++++----------
.../mob/living/simple_animal/simple_animal.dm | 4 +-
code/modules/wiremod/preset/speech_relay.dm | 2 +-
config/entries/logging.txt | 2 +-
strings/cas_white.txt | 2 +-
strings/phobia.json | 1 +
15 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/code/controllers/subsystem/persistence/poly_parrot.dm b/code/controllers/subsystem/persistence/poly_parrot.dm
index 64743e9623..b0014c249a 100644
--- a/code/controllers/subsystem/persistence/poly_parrot.dm
+++ b/code/controllers/subsystem/persistence/poly_parrot.dm
@@ -1,11 +1,11 @@
/**
- * Persists poly messages across rounds
+ * Persists polly messages across rounds
*/
/datum/controller/subsystem/persistence/LoadGamePersistence()
. = ..()
- LoadPoly()
+ LoadPolly()
-/datum/controller/subsystem/persistence/proc/LoadPoly()
- for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.alive_mob_list)
+/datum/controller/subsystem/persistence/proc/LoadPolly()
+ for(var/mob/living/simple_animal/parrot/Polly/P in GLOB.alive_mob_list)
twitterize(P.speech_buffer, "polytalk")
break //Who's been duping the bird?!
diff --git a/code/datums/diseases/parrotpossession.dm b/code/datums/diseases/parrotpossession.dm
index 1a3346d565..2fb3a36459 100644
--- a/code/datums/diseases/parrotpossession.dm
+++ b/code/datums/diseases/parrotpossession.dm
@@ -13,7 +13,7 @@
severity = DISEASE_SEVERITY_MEDIUM
infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD|MOB_ROBOTIC|MOB_MINERAL
bypasses_immunity = TRUE //2spook
- var/mob/living/simple_animal/parrot/Poly/ghost/parrot
+ var/mob/living/simple_animal/parrot/Polly/ghost/parrot
/datum/disease/parrot_possession/stage_act()
..()
diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm
index bab74300f5..0964f7aad3 100644
--- a/code/modules/admin/chat_commands.dm
+++ b/code/modules/admin/chat_commands.dm
@@ -150,7 +150,7 @@ GLOBAL_LIST(round_end_notifiees)
/datum/tgs_chat_command/wheelofsalt/Run(datum/tgs_chat_user/sender, params)
var/saltresult = "The wheel of salt [pick("clatters","screams","vibrates","clanks","resonates","groans","moans","squeaks","emits a[pick(" god-forsaken"," lewd"," creepy"," generic","n orgasmic"," demonic")] [pick("airhorn","bike horn","trumpet","clown","latex","vore","dog","laughing")] noise")] as it spins violently... And it seems the salt of the day is the "
- var/saltprimarysubject = "[pick("combat","medical","grab","furry","wall","orgasm","cat","ERP","lizard","dog","latex","vision cone","atmospherics","table","chem","vore","dogborg","Skylar Lineman","Mekhi Anderson","Peppermint","rework","cum","dick","cockvore","Medihound","sleeper","belly sleeper","door wires","flightsuit","coder privilege","Developer abuse","ban reason","github self merge","red panda","beret","male catgirl","powergame","hexacrocin removal","Discord server","Clitadel","Cargonia","Solarian Republic","Main and RP merger","bluespace","salt","chem dispenser theft","Botany","moth","BWOINK","anal vore","stamina","Mason Jakops","mining","noodle","milf","Lavaland","Necropolis","Ashwalker","Chase Redtail","Drew Mint","Pavel Marsk","Joker Amari","Durgit","chaplain","Antag","nanite","Syndicate","Nar-Sie","Ratvar","Cult","maint","Foam-Force","AI","cyborg","ghost","clockwork","cyberpunk","vaporwave","Clown","Leon Beech","Mime","security","research","Megafauna","Bubblegum","Ash Drake","Legion","Colossus","White Shuttle","Changeling","Cowboy","Space Ninja","Poly","Revolutionary","Skyrim","forbidden fruits","xenomorph","blob","Nuclear Operative","crossdressing")]"
+ var/saltprimarysubject = "[pick("combat","medical","grab","furry","wall","orgasm","cat","ERP","lizard","dog","latex","vision cone","atmospherics","table","chem","vore","dogborg","Skylar Lineman","Mekhi Anderson","Peppermint","rework","cum","dick","cockvore","Medihound","sleeper","belly sleeper","door wires","flightsuit","coder privilege","Developer abuse","ban reason","github self merge","red panda","beret","male catgirl","powergame","hexacrocin removal","Discord server","Clitadel","Cargonia","Solarian Republic","Main and RP merger","bluespace","salt","chem dispenser theft","Botany","moth","BWOINK","anal vore","stamina","Mason Jakops","mining","noodle","milf","Lavaland","Necropolis","Ashwalker","Chase Redtail","Drew Mint","Pavel Marsk","Joker Amari","Durgit","chaplain","Antag","nanite","Syndicate","Nar-Sie","Ratvar","Cult","maint","Foam-Force","AI","cyborg","ghost","clockwork","cyberpunk","vaporwave","Clown","Leon Beech","Mime","security","research","Megafauna","Bubblegum","Ash Drake","Legion","Colossus","White Shuttle","Changeling","Cowboy","Space Ninja","Polly","Revolutionary","Skyrim","forbidden fruits","xenomorph","blob","Nuclear Operative","crossdressing")]"
var/saltsecondarysubject = "[pick("rework","changes","r34","ban","removal","addition","leak","proposal","fanart","introduction","tabling","ERP","bikeshedding","crossdressing","sprites","semen keg","argument","theft","nerf","screeching","salt","creampie","lewding","murder","kissing","marriage","replacement","fucking","ship","netflix adaptation","dance","remaster","system","voyeur","decoration","pre-order","bukkake","seduction","worship","gangbang","handholding")]"
if(prob(10))
saltresult += "@here for your salt, all day every day"
@@ -174,12 +174,12 @@ GLOBAL_LIST(round_end_notifiees)
/datum/tgs_chat_command/despacito/Run()
return "https://www.youtube.com/watch?v=kJQP7kiw5Fk"
-/datum/tgs_chat_command/poly
- name = "poly"
- help_text = "The Lewder, more applicable Poly speak for Citadel Station 13."
+/datum/tgs_chat_command/polly
+ name = "polly"
+ help_text = "The Lewder, more applicable Polly speak for Citadel Station 13."
var/list/speech_buffer
-/datum/tgs_chat_command/poly/Run()
+/datum/tgs_chat_command/polly/Run()
LAZYINITLIST(speech_buffer) //I figure this is just safe to do for everything at this point
if(length(speech_buffer)) //Let's not look up the whole json EVERY TIME, just the first time.
return "[pick(speech_buffer)]"
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index d134853494..18d880aa48 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -489,8 +489,8 @@
M.change_mob_type( /mob/living/simple_animal/crab/Coffee , null, null, delmob )
if("parrot")
M.change_mob_type( /mob/living/simple_animal/parrot , null, null, delmob )
- if("polyparrot")
- M.change_mob_type( /mob/living/simple_animal/parrot/Poly , null, null, delmob )
+ if("pollyparrot")
+ M.change_mob_type( /mob/living/simple_animal/parrot/Polly , null, null, delmob )
if("constructarmored")
M.change_mob_type( /mob/living/simple_animal/hostile/construct/armored , null, null, delmob )
if("constructbuilder")
diff --git a/code/modules/antagonists/bloodsucker/powers/mesmerize.dm b/code/modules/antagonists/bloodsucker/powers/mesmerize.dm
index efdd312c6e..25f50d7af4 100644
--- a/code/modules/antagonists/bloodsucker/powers/mesmerize.dm
+++ b/code/modules/antagonists/bloodsucker/powers/mesmerize.dm
@@ -2,7 +2,7 @@
// * MEZMERIZE
// LOVE: Target falls in love with you. Being harmed directly causes them harm if they see it?
// STAY: Target will do everything they can to stand in the same place.
-// FOLLOW: Target follows you, spouting random phrases from their history (or maybe Poly's or NPC's vocab?)
+// FOLLOW: Target follows you, spouting random phrases from their history (or maybe Polly's or NPC's vocab?)
// ATTACK: Target finds a nearby non-Bloodsucker victim to attack.
/datum/action/bloodsucker/targeted/mesmerize
diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm
index 2c01a66d43..a840180ea9 100644
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -45,9 +45,9 @@
if(9)
SpeakPeace(list("Alright maybe that's too boring.", "I can't keep manually typing these lines out though.", "It's hard to explain but the code structure I'm using is kind of terrible."))
if(10)
- SpeakPeace(list("Oh I have an idea!", "Lets outsource this endless banter to Poly!", "Then you'll be able to keep listening to this without getting bored!"))
+ SpeakPeace(list("Oh I have an idea!", "Lets outsource this endless banter to Polly!", "Then you'll be able to keep listening to this without getting bored!"))
if(isnull(shenanigans) || !shenanigans.len)
- shenanigans = list("Except the poly file is missing...")
+ shenanigans = list("Except the polly file is missing...")
if(11 to 14, 16 to 50, 52 to 99, 103 to 107, 109 to 203, 205 to 249, 252 to 665, 667 to 999, 1001 to 5642)
SpeakPeace(list(pick(shenanigans),pick(shenanigans),pick(shenanigans)))
if(times_spoken_to % 10 == 0)
@@ -55,7 +55,7 @@
if(15)
SpeakPeace(list("See? Isn't this fun?","Now you can mash this for hours without getting bored.","Anyway I'll leave you it."))
if(51)
- SpeakPeace(list("The fun never ends around here.", "The Poly text files stores up to 500 statements.", "But you've probably heard a few repeats by now."))
+ SpeakPeace(list("The fun never ends around here.", "The Polly text files stores up to 500 statements.", "But you've probably heard a few repeats by now."))
if(100)
SpeakPeace(list("And that's a solid hundred.", "Good hustle I guess.", "You've probably heard a lot of repeats by now."))
if(101)
diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm
index 9af18e13f6..4fc50e2385 100644
--- a/code/modules/cargo/packs/engineering.dm
+++ b/code/modules/cargo/packs/engineering.dm
@@ -49,7 +49,7 @@
/datum/supply_pack/engineering/engihardsuit
name = "Engineering Hardsuit"
- desc = "Poly 'Who stole all the hardsuits!' Well now you can get more hardsuits if needed! NOTE ONE HARDSUIT IS IN THIS CRATE, as well as one air tank and mask!"
+ desc = "Polly 'Who stole all the hardsuits!' Well now you can get more hardsuits if needed! NOTE ONE HARDSUIT IS IN THIS CRATE, as well as one air tank and mask!"
cost = 2250
access = ACCESS_ENGINE
contains = list(/obj/item/tank/internals/air,
diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm
index 263e3aa660..9824355e4b 100644
--- a/code/modules/events/holiday/halloween.dm
+++ b/code/modules/events/holiday/halloween.dm
@@ -15,9 +15,9 @@
for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_living_list)
Ian.place_on_head(new /obj/item/bedsheet(Ian))
- for(var/mob/living/simple_animal/parrot/Poly/Poly in GLOB.mob_living_list)
- new /mob/living/simple_animal/parrot/Poly/ghost(Poly.loc)
- qdel(Poly)
+ for(var/mob/living/simple_animal/parrot/Polly/Polly in GLOB.mob_living_list)
+ new /mob/living/simple_animal/parrot/Polly/ghost(Polly.loc)
+ qdel(Polly)
/datum/round_event/spooky/announce(fake)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index a822917aa4..3e16c9afa1 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -660,7 +660,7 @@
"goat" = 'icons/mob/animal.dmi',
"cat" = 'icons/mob/pets.dmi',
"cat2" = 'icons/mob/pets.dmi',
- "poly" = 'icons/mob/animal.dmi',
+ "polly" = 'icons/mob/animal.dmi',
"pug" = 'icons/mob/pets.dmi',
"spider" = 'icons/mob/animal.dmi'
)
@@ -669,7 +669,7 @@
if(input)
qdel(holo_icon)
switch(input)
- if("poly")
+ if("polly")
holo_icon = getHologramIcon(icon(icon_list[input],"parrot_fly"))
if("chicken")
holo_icon = getHologramIcon(icon(icon_list[input],"chicken_brown"))
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index fe1ee35428..1c9b16cb36 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -84,7 +84,7 @@
var/speech_shuffle_rate = 20
var/list/available_channels = list()
- //Headset for Poly to yell at engineers :)
+ //Headset for Polly to yell at engineers :)
var/obj/item/radio/headset/ears = null
/// spawns with headset
var/spawns_with_headset = FALSE
@@ -349,7 +349,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
parrot_state |= PARROT_FLEE
icon_state = icon_living
drop_held_item(0)
- else if(istype(O, /obj/item/reagent_containers/food/snacks/cracker)) //Poly wants a cracker.
+ else if(istype(O, /obj/item/reagent_containers/food/snacks/cracker)) //Polly wants a cracker.
qdel(O)
if(health < maxHealth)
adjustBruteLoss(-10)
@@ -894,10 +894,10 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
/*
* Sub-types
*/
-/mob/living/simple_animal/parrot/Poly
- name = "Poly"
- desc = "Poly the Parrot. An expert on quantum cracker theory."
- speak = list("Poly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE")
+/mob/living/simple_animal/parrot/Polly
+ name = "Polly"
+ desc = "Polly the Parrot. An expert on quantum cracker theory."
+ speak = list("Polly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE")
gold_core_spawnable = NO_SPAWN
speak_chance = 3
spawns_with_headset = TRUE
@@ -906,7 +906,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
var/longest_survival = 0
var/longest_deathstreak = 0
-/mob/living/simple_animal/parrot/Poly/Initialize(mapload)
+/mob/living/simple_animal/parrot/Polly/Initialize(mapload)
ears = new /obj/item/radio/headset/headset_eng(src)
available_channels = list(":e")
Read_Memory()
@@ -929,30 +929,30 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
. = ..()
-/mob/living/simple_animal/parrot/Poly/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
+/mob/living/simple_animal/parrot/Polly/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
. = ..()
if(. && !client && prob(1) && prob(1) && CONFIG_GET(string/chat_squawk_tag)) //Only the one true bird may speak across dimensions.
send2chat("A stray squawk is heard... \"[message]\"", CONFIG_GET(string/chat_squawk_tag))
-/mob/living/simple_animal/parrot/Poly/BiologicalLife(seconds, times_fired)
+/mob/living/simple_animal/parrot/Polly/BiologicalLife(seconds, times_fired)
if(!(. = ..()))
return
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
Write_Memory(FALSE)
memory_saved = TRUE
-/mob/living/simple_animal/parrot/Poly/death(gibbed)
+/mob/living/simple_animal/parrot/Polly/death(gibbed)
if(!memory_saved)
Write_Memory(TRUE)
if(rounds_survived == longest_survival || rounds_survived == longest_deathstreak || prob(0.666))
- var/mob/living/simple_animal/parrot/Poly/ghost/G = new(loc)
+ var/mob/living/simple_animal/parrot/Polly/ghost/G = new(loc)
if(mind)
mind.transfer_to(G)
else
transfer_ckey(G)
..(gibbed)
-/mob/living/simple_animal/parrot/Poly/proc/Read_Memory()
+/mob/living/simple_animal/parrot/Polly/proc/Read_Memory()
var/saved_color
if(fexists("data/npc_saves/Poly.sav")) //legacy compatability to convert old format to new
var/savefile/S = new /savefile("data/npc_saves/Poly.sav")
@@ -976,7 +976,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
if(!isnull(saved_color))
add_atom_colour(json_decode(saved_color), FIXED_COLOUR_PRIORITY)
-/mob/living/simple_animal/parrot/Poly/proc/Write_Memory(dead)
+/mob/living/simple_animal/parrot/Polly/proc/Write_Memory(dead)
var/json_file = file("data/npc_saves/Poly.json")
var/list/file_data = list()
if(islist(speech_buffer))
@@ -1003,14 +1003,14 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
-/mob/living/simple_animal/parrot/Poly/ratvar_act()
+/mob/living/simple_animal/parrot/Polly/ratvar_act()
playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', 75, TRUE)
var/mob/living/simple_animal/parrot/clock_hawk/H = new(loc)
H.setDir(dir)
qdel(src)
-/mob/living/simple_animal/parrot/Poly/ghost
- name = "The Ghost of Poly"
+/mob/living/simple_animal/parrot/Polly/ghost
+ name = "The Ghost of Polly"
desc = "Doomed to squawk the Earth."
color = "#FFFFFF"
alpha = 77
@@ -1019,16 +1019,16 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
incorporeal_move = INCORPOREAL_MOVE_BASIC
butcher_results = list(/obj/item/ectoplasm = 1)
-/mob/living/simple_animal/parrot/Poly/ghost/Initialize(mapload)
+/mob/living/simple_animal/parrot/Polly/ghost/Initialize(mapload)
memory_saved = TRUE //At this point nothing is saved
. = ..()
-/mob/living/simple_animal/parrot/Poly/ghost/handle_automated_speech()
+/mob/living/simple_animal/parrot/Polly/ghost/handle_automated_speech()
if(ismob(loc))
return
..()
-/mob/living/simple_animal/parrot/Poly/ghost/handle_automated_movement()
+/mob/living/simple_animal/parrot/Polly/ghost/handle_automated_movement()
if(isliving(parrot_interest))
if(!ishuman(parrot_interest))
parrot_interest = null
@@ -1037,7 +1037,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
Possess(parrot_interest)
..()
-/mob/living/simple_animal/parrot/Poly/ghost/proc/Possess(mob/living/carbon/human/H)
+/mob/living/simple_animal/parrot/Polly/ghost/proc/Possess(mob/living/carbon/human/H)
if(!ishuman(H))
return
var/datum/disease/parrot_possession/P = new
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 695eec6cb2..4d992f274e 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -225,7 +225,7 @@
length += emote_see.len
var/randomValue = rand(1,length)
if(randomValue <= speak.len)
- say(pick(speak), forced = "poly")
+ say(pick(speak), forced = "polly")
else
randomValue -= speak.len
if(emote_see && randomValue <= emote_see.len)
@@ -233,7 +233,7 @@
else
emote("me [pick(emote_hear)]", 2)
else
- say(pick(speak), forced = "poly")
+ say(pick(speak), forced = "polly")
else
if(!(emote_hear && emote_hear.len) && (emote_see && emote_see.len))
emote("me", EMOTE_VISIBLE, pick(emote_see))
diff --git a/code/modules/wiremod/preset/speech_relay.dm b/code/modules/wiremod/preset/speech_relay.dm
index a1e66832c9..bc84568cc0 100644
--- a/code/modules/wiremod/preset/speech_relay.dm
+++ b/code/modules/wiremod/preset/speech_relay.dm
@@ -1,7 +1,7 @@
/**
* # Speech Relay preset
*
- * Acts like poly. Says whatever it hears.
+ * Acts like polly. Says whatever it hears.
*/
/obj/item/integrated_circuit/loaded/speech_relay
diff --git a/config/entries/logging.txt b/config/entries/logging.txt
index 66a7c566ca..8da1ac4474 100644
--- a/config/entries/logging.txt
+++ b/config/entries/logging.txt
@@ -68,7 +68,7 @@ LOG_ECON
LOG_WORLD_TOPIC
## enables use of the proc twitterize() that lets you take a large list of strings and turn it into a JSON file of tweet sized strings.
-## As an example of how this could be """useful""" look towards Poly (https://twitter.com/Poly_the_Parrot)
+## As an example of how this could be """useful""" look towards Polly (https://twitter.com/Poly_the_Parrot)
# LOG_TWITTER
## Enable logging pictures
diff --git a/strings/cas_white.txt b/strings/cas_white.txt
index 3e229862a2..397c7febff 100644
--- a/strings/cas_white.txt
+++ b/strings/cas_white.txt
@@ -72,7 +72,7 @@ Supermatter undergarments.
A permaban.
Stealing all the miners' ore.
Bluespace artillery.
-Poly reading porn over the radio again.
+Polly reading porn over the radio again.
Mining the shaft.
Grab intent.
A blob zombie with an erection.
diff --git a/strings/phobia.json b/strings/phobia.json
index fc8fb31995..ee25cc62fa 100644
--- a/strings/phobia.json
+++ b/strings/phobia.json
@@ -250,6 +250,7 @@
"bird",
"beak",
"poly",
+ "polly",
"wing",
"claw",
"peck",
From fc74dd8a692b5f0bec124b8be5d55159a383935d Mon Sep 17 00:00:00 2001
From: deathride58
Date: Wed, 20 Jul 2022 17:19:27 -0400
Subject: [PATCH 03/28] maps, filenames, and DME
---
_maps/map_files/BoxStation/BoxStation.dmm | 2 +-
_maps/map_files/CogStation/CogStation.dmm | 2 +-
_maps/map_files/Deltastation/DeltaStation2.dmm | 2 +-
_maps/map_files/FestiveBall/FestiveStation.dmm | 2 +-
_maps/map_files/KiloStation/KiloStation.dmm | 2 +-
_maps/map_files/LambdaStation/lambda.dmm | 2 +-
_maps/map_files/MetaStation/MetaStation.dmm | 2 +-
_maps/map_files/OmegaStation/OmegaStation.dmm | 2 +-
_maps/map_files/PubbyStation/PubbyStation.dmm | 2 +-
_maps/map_files/Snaxi/Snaxi.dmm | 2 +-
.../subsystem/persistence/{poly_parrot.dm => polly_parrot.dm} | 0
tgstation.dme | 2 +-
12 files changed, 11 insertions(+), 11 deletions(-)
rename code/controllers/subsystem/persistence/{poly_parrot.dm => polly_parrot.dm} (100%)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 836d5a20e6..d0818c6c9a 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -42889,7 +42889,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"cbr" = (
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index 1dcb97a647..6f1ec5682b 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -57320,7 +57320,7 @@
name = "Chief Engineer's RC";
pixel_y = -32
},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel,
/area/command/heads_quarters/ce)
"csf" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index d64abed5dc..25a58c4406 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -75787,7 +75787,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"fLq" = (
diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm
index a559280263..353b298ceb 100644
--- a/_maps/map_files/FestiveBall/FestiveStation.dmm
+++ b/_maps/map_files/FestiveBall/FestiveStation.dmm
@@ -5069,7 +5069,7 @@
/area/command/heads_quarters/ce)
"ane" = (
/obj/structure/filingcabinet/chestdrawer,
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"anf" = (
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index fa3c32a418..37a0292f45 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -13429,7 +13429,7 @@
/obj/item/radio/intercom{
pixel_x = 28
},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"awq" = (
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
index 394f7fb7c1..97a17ff303 100644
--- a/_maps/map_files/LambdaStation/lambda.dmm
+++ b/_maps/map_files/LambdaStation/lambda.dmm
@@ -44859,7 +44859,7 @@
/obj/item/gps/engineering{
gpstag = "CE0"
},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"bUH" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index dd05cf72ea..52fe46984f 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -57489,7 +57489,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"ixH" = (
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index a237802205..e650ceba07 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -6363,7 +6363,7 @@
c_tag = "Chief Engineer's Office";
network = list("ss13","engine")
},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 10
},
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 2c01f48150..d8d18c4407 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -42909,7 +42909,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel,
/area/command/heads_quarters/ce)
"bVE" = (
diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm
index 4def794b4f..1e3c094cf6 100644
--- a/_maps/map_files/Snaxi/Snaxi.dmm
+++ b/_maps/map_files/Snaxi/Snaxi.dmm
@@ -85,7 +85,7 @@
/obj/machinery/keycard_auth{
pixel_y = -28
},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel,
/area/command/heads_quarters/ce)
"aai" = (
diff --git a/code/controllers/subsystem/persistence/poly_parrot.dm b/code/controllers/subsystem/persistence/polly_parrot.dm
similarity index 100%
rename from code/controllers/subsystem/persistence/poly_parrot.dm
rename to code/controllers/subsystem/persistence/polly_parrot.dm
diff --git a/tgstation.dme b/tgstation.dme
index 2d0e135760..5e513c6b9a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -420,7 +420,7 @@
#include "code\controllers\subsystem\persistence\_persistence.dm"
#include "code\controllers\subsystem\persistence\cleanable_debris.dm"
#include "code\controllers\subsystem\persistence\panic_bunker.dm"
-#include "code\controllers\subsystem\persistence\poly_parrot.dm"
+#include "code\controllers\subsystem\persistence\polly_parrot.dm"
#include "code\controllers\subsystem\persistence\recent_votes_etc.dm"
#include "code\controllers\subsystem\persistence\secret_satchels.dm"
#include "code\controllers\subsystem\persistence\trophies.dm"
From f9cda832ba929d89189d6e136fac394d1f91c855 Mon Sep 17 00:00:00 2001
From: TripleShades
Date: Wed, 20 Jul 2022 23:25:35 -0400
Subject: [PATCH 04/28] powerrrrr
---
.../RandomZLevels/away_mission/SnowCabin.dmm | 602 ++++++++++++------
.../away_mission/jungleresort.dmm | 4 +-
.../away_mission/undergroundoutpost45.dmm | 192 +++---
3 files changed, 519 insertions(+), 279 deletions(-)
diff --git a/_maps/RandomZLevels/away_mission/SnowCabin.dmm b/_maps/RandomZLevels/away_mission/SnowCabin.dmm
index e7f5341bea..d9a401f146 100644
--- a/_maps/RandomZLevels/away_mission/SnowCabin.dmm
+++ b/_maps/RandomZLevels/away_mission/SnowCabin.dmm
@@ -99,7 +99,9 @@
/obj/machinery/door/airlock/command{
name = "Manager's Office"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"as" = (
@@ -134,7 +136,9 @@
/area/awaymission/cabin)
"aw" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"ax" = (
@@ -185,11 +189,16 @@
/turf/open/floor/plasteel/freezer,
/area/awaymission/cabin)
"aD" = (
-/obj/machinery/power/smes/magical{
- desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. It seems to be powered just fine without our intervention.";
- name = "nanotrasen power storage unit"
- },
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/smes{
+ charge = 1.5e+006;
+ input_level = 30000;
+ inputting = 0;
+ output_level = 7000
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"aE" = (
@@ -207,7 +216,12 @@
pixel_y = 23
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"aG" = (
@@ -255,7 +269,9 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -281,15 +297,6 @@
/turf/open/floor/carpet,
/area/awaymission/cabin)
"aQ" = (
-/obj/structure{
- anchored = 1;
- density = 1;
- desc = "Generates power from lava!";
- dir = 1;
- icon = 'icons/obj/atmospherics/pipes/simple.dmi';
- icon_state = "compressor";
- name = "geothermal generator"
- },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
icon_state = "panelscorched"
@@ -366,7 +373,9 @@
/turf/open/floor/wood,
/area/awaymission/cabin)
"bb" = (
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/carpet,
/area/awaymission/cabin)
"bc" = (
@@ -431,7 +440,9 @@
id_tag = "snowdorm5";
name = "Cabin 5"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"bn" = (
@@ -463,7 +474,9 @@
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"bt" = (
@@ -492,7 +505,9 @@
"by" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel/cafeteria,
/area/awaymission/cabin)
"bz" = (
@@ -611,7 +626,9 @@
/obj/machinery/door/airlock/maintenance{
name = "Garage"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"bW" = (
@@ -739,7 +756,9 @@
/obj/structure/sign/poster/official/soft_cap_pop_art{
pixel_y = 32
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"cu" = (
@@ -838,14 +857,18 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"cM" = (
/obj/machinery/door/airlock/wood{
name = "Gateway"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"cN" = (
@@ -859,12 +882,16 @@
/turf/open/floor/carpet,
/area/awaymission/cabin)
"cP" = (
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel/white,
/area/awaymission/cabin)
"cQ" = (
/obj/effect/landmark/awaystart,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/carpet,
/area/awaymission/cabin)
"cR" = (
@@ -898,7 +925,9 @@
/area/awaymission/cabin)
"cW" = (
/obj/item/shovel,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -957,7 +986,9 @@
/obj/structure/chair/wood{
dir = 4
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/carpet,
/area/awaymission/cabin)
"df" = (
@@ -1040,20 +1071,19 @@
/area/awaymission/cabin)
"du" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plating{
icon_state = "panelscorched"
},
/area/awaymission/cabin)
"dv" = (
-/obj/structure{
- anchored = 1;
- density = 1;
- desc = "Generates power from lava!";
- icon = 'icons/obj/atmospherics/pipes/simple.dmi';
- icon_state = "turbine";
- name = "geothermal generator"
- },
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/rtg,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -1269,7 +1299,9 @@
/turf/open/floor/wood/cold,
/area/awaymission/cabin/snowforest)
"eg" = (
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"eh" = (
@@ -1279,7 +1311,9 @@
"ei" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/glass,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"ej" = (
@@ -1350,7 +1384,9 @@
/area/awaymission/cabin/snowforest)
"et" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"eu" = (
@@ -2724,11 +2760,15 @@
/obj/structure/sign/poster/official/fruit_bowl{
pixel_y = 32
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"hi" = (
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel/freezer,
/area/awaymission/cabin)
"hj" = (
@@ -2736,7 +2776,9 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"hk" = (
@@ -2781,7 +2823,9 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/generic,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"hs" = (
@@ -2789,14 +2833,18 @@
/obj/structure/sign/poster/contraband/missing_gloves{
pixel_x = 32
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"ht" = (
/obj/structure/window{
dir = 4
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"hu" = (
@@ -2841,28 +2889,36 @@
/turf/open/floor/plating,
/area/awaymission/cabin)
"hz" = (
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/cafeteria,
/area/awaymission/cabin)
"hA" = (
/obj/machinery/door/airlock/freezer{
name = "Freezer"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/freezer,
/area/awaymission/cabin)
"hB" = (
/obj/machinery/door/airlock{
name = "Backstage"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"hC" = (
/obj/structure/chair/wood{
dir = 8
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/carpet,
/area/awaymission/cabin)
"hD" = (
@@ -2874,7 +2930,9 @@
/obj/machinery/door/airlock{
name = "Kitchen"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"hF" = (
@@ -2889,7 +2947,9 @@
/obj/structure/chair/wood{
dir = 1
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"hH" = (
@@ -3124,7 +3184,9 @@
/obj/structure/extinguisher_cabinet{
pixel_y = 32
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"io" = (
@@ -3321,7 +3383,9 @@
id_tag = "snowdorm1";
name = "Cabin 1"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"iW" = (
@@ -3329,7 +3393,9 @@
id_tag = "snowdorm2";
name = "Cabin 2"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"iX" = (
@@ -3337,7 +3403,9 @@
id_tag = "snowdorm3";
name = "Cabin 3"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"iY" = (
@@ -3345,7 +3413,9 @@
id_tag = "snowdorm4";
name = "Cabin 4"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/wood,
/area/awaymission/cabin)
"iZ" = (
@@ -3518,7 +3588,9 @@
},
/obj/item/reagent_containers/glass/bottle/cryoxadone,
/obj/item/reagent_containers/glass/bottle/cryoxadone,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/white,
/area/awaymission/cabin)
"jr" = (
@@ -3649,7 +3721,9 @@
name = "Generator Room"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"jD" = (
@@ -5450,7 +5524,9 @@
/turf/open/floor/wood,
/area/awaymission/cabin)
"nR" = (
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"nS" = (
@@ -5477,13 +5553,152 @@
/obj/machinery/door/airlock/maintenance{
name = "Maintenance"
},
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
+"nY" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/awaymission/cabin)
+"rn" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/awaymission/cabin)
+"rV" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/wood,
+/area/awaymission/cabin)
+"sn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/awaymission/cabin)
+"uk" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/awaymission/cabin)
+"uD" = (
+/obj/structure/chair/wood{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/carpet,
+/area/awaymission/cabin)
+"ww" = (
+/obj/effect/landmark/awaystart,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/carpet,
+/area/awaymission/cabin)
+"wx" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/awaymission/cabin)
+"zF" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/wood,
+/area/awaymission/cabin)
+"BB" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/awaymission/cabin)
+"Co" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/awaymission/cabin)
+"DU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plating,
+/area/awaymission/cabin)
+"Fj" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/wood,
+/area/awaymission/cabin)
+"FH" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/wood,
+/area/awaymission/cabin)
+"Hb" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/carpet,
+/area/awaymission/cabin)
+"He" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/wood,
+/area/awaymission/cabin)
+"IG" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white,
+/area/awaymission/cabin)
+"JZ" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/carpet,
+/area/awaymission/cabin)
+"KS" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/carpet,
+/area/awaymission/cabin)
+"MB" = (
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/carpet,
+/area/awaymission/cabin)
"MS" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/oil,
-/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/awaymission/cabin)
"TZ" = (
@@ -5495,6 +5710,37 @@
/obj/item/clothing/shoes/winterboots/ice_boots,
/turf/open/floor/plating/ice/smooth,
/area/awaymission/cabin/caves)
+"UL" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/awaymission/cabin)
+"WD" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/wood,
+/area/awaymission/cabin)
+"WX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/awaymission/cabin)
+"WY" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/wood,
+/area/awaymission/cabin)
(1,1,1) = {"
ab
@@ -25696,21 +25942,21 @@ iZ
aN
jl
bb
-bb
-bb
+JZ
+JZ
eg
bm
-eg
+Fj
nS
an
-eg
+rV
eg
eg
eg
eg
eg
hB
-eg
+Fj
aq
an
cT
@@ -25957,7 +26203,7 @@ az
az
aq
an
-eg
+He
bh
an
cA
@@ -25967,7 +26213,7 @@ an
an
hx
an
-eg
+He
aq
an
cU
@@ -26214,7 +26460,7 @@ az
az
aq
an
-eg
+He
aq
an
aq
@@ -26224,7 +26470,7 @@ aq
aq
aq
an
-eg
+He
aq
an
cV
@@ -26481,11 +26727,11 @@ aq
aq
bh
an
-eg
+He
bh
an
aL
-nR
+BB
aL
ed
an
@@ -26728,17 +26974,17 @@ an
an
aR
an
-eg
+He
aq
an
aq
aq
-eg
+FH
aq
aq
aq
an
-eg
+He
aq
an
cU
@@ -26985,21 +27231,21 @@ aH
an
an
an
-eg
+He
aq
an
cz
aq
-eg
+He
aq
aq
bh
an
-eg
+He
aq
an
ed
-nR
+BB
aL
kE
an
@@ -27242,7 +27488,7 @@ an
an
aS
hg
-eg
+He
bh
an
nT
@@ -27252,11 +27498,11 @@ bo
bo
cB
an
-eg
+WD
eg
bV
-aw
-aw
+sn
+DU
gM
an
an
@@ -27499,17 +27745,17 @@ aH
an
an
an
-eg
+He
aq
an
aO
aO
hC
-hC
-hC
-bb
-bb
-eg
+MB
+MB
+JZ
+JZ
+WY
aq
an
eb
@@ -27756,7 +28002,7 @@ an
an
aT
an
-eg
+He
aq
an
az
@@ -27766,7 +28012,7 @@ az
aq
aq
cO
-eg
+He
bh
an
an
@@ -28270,7 +28516,7 @@ az
az
aq
an
-eg
+He
aq
an
aP
@@ -28280,7 +28526,7 @@ nB
hd
az
aO
-eg
+He
aq
aq
an
@@ -28527,7 +28773,7 @@ az
az
aq
an
-eg
+He
bh
an
bq
@@ -28537,7 +28783,7 @@ hc
hd
az
az
-eg
+He
aq
aq
aN
@@ -28780,11 +29026,11 @@ ja
bp
jm
bb
-bb
-bb
+JZ
+JZ
eg
iY
-eg
+WY
aq
an
bt
@@ -28794,7 +29040,7 @@ jx
hd
az
cO
-eg
+He
aq
aq
iR
@@ -29041,7 +29287,7 @@ aI
aA
jj
an
-eg
+He
aq
an
cN
@@ -29308,7 +29554,7 @@ az
aq
aq
aO
-eg
+He
aq
aq
an
@@ -29555,17 +29801,17 @@ ju
au
ji
an
-eg
+He
aq
an
de
-de
-de
-de
-de
-bb
-bb
-eg
+uD
+uD
+uD
+uD
+JZ
+JZ
+WY
bh
an
an
@@ -29808,11 +30054,11 @@ jb
aN
jn
bb
-bb
-bb
+JZ
+JZ
eg
iX
-eg
+WY
bh
an
hb
@@ -29822,7 +30068,7 @@ eu
cK
cD
an
-eg
+He
aq
aq
an
@@ -30069,7 +30315,7 @@ az
az
aq
an
-eg
+He
aq
an
hn
@@ -30079,7 +30325,7 @@ aq
aq
aq
an
-eg
+He
aq
aq
aN
@@ -30326,7 +30572,7 @@ az
az
aq
an
-eg
+He
aq
an
bv
@@ -30336,7 +30582,7 @@ aq
ap
aq
an
-eg
+He
aq
aq
iU
@@ -30593,7 +30839,7 @@ bu
an
eo
an
-eg
+He
aq
aq
bp
@@ -30840,7 +31086,7 @@ an
an
aU
an
-eg
+He
aq
an
bw
@@ -30848,9 +31094,9 @@ bO
bO
bO
bO
-hz
+Co
hE
-eg
+WY
aq
aq
an
@@ -31097,7 +31343,7 @@ aH
an
an
an
-eg
+He
aq
an
bx
@@ -31105,9 +31351,9 @@ bO
cJ
cF
cJ
-hz
+nY
an
-eg
+He
bh
an
an
@@ -31354,7 +31600,7 @@ an
an
hf
hy
-eg
+He
aq
an
by
@@ -31362,9 +31608,9 @@ hz
hz
hz
hz
-hz
+rn
an
-eg
+He
aq
aq
an
@@ -31611,7 +31857,7 @@ aH
an
an
an
-eg
+He
bh
an
bz
@@ -31619,9 +31865,9 @@ bO
bW
ck
cj
-hz
+nY
an
-eg
+He
aq
aq
aN
@@ -31868,7 +32114,7 @@ an
an
aW
an
-eg
+He
aq
an
an
@@ -31878,7 +32124,7 @@ an
an
hA
an
-eg
+He
aq
aq
iS
@@ -32133,9 +32379,9 @@ bB
bX
cl
cl
-hi
+uk
an
-eg
+He
aq
aq
bp
@@ -32382,15 +32628,15 @@ az
az
aq
an
-eg
+He
aq
an
hi
-hi
-hi
-hi
-hi
-hi
+UL
+UL
+UL
+UL
+wx
an
hh
aq
@@ -32639,7 +32885,7 @@ az
az
aq
an
-eg
+He
aq
an
bC
@@ -32649,7 +32895,7 @@ is
dt
cG
an
-eg
+He
bh
an
an
@@ -32892,11 +33138,11 @@ jc
bp
jo
bb
-bb
-bb
+JZ
+JZ
eg
iW
-eg
+WY
aq
an
an
@@ -32906,7 +33152,7 @@ an
an
an
an
-eg
+He
aq
aq
an
@@ -33153,7 +33399,7 @@ aI
aA
jg
an
-eg
+He
aq
an
aJ
@@ -33163,7 +33409,7 @@ cv
hq
cv
an
-eg
+He
aq
aq
aN
@@ -33420,7 +33666,7 @@ bE
bE
lz
an
-eg
+He
aq
aq
iT
@@ -33667,7 +33913,7 @@ jw
au
jh
an
-eg
+He
aq
an
bD
@@ -33677,7 +33923,7 @@ cI
hD
bE
nM
-eg
+He
aq
aq
bp
@@ -33920,21 +34166,21 @@ jd
aN
jp
bb
-bb
-bb
+JZ
+JZ
eg
iV
-eg
+WY
aq
an
cP
-cP
-cP
-cP
+IG
+IG
+IG
jq
-cP
-cP
-eg
+IG
+IG
+WY
aq
aq
an
@@ -34181,7 +34427,7 @@ az
az
aq
an
-eg
+He
aq
an
bF
@@ -34191,7 +34437,7 @@ ho
bE
lz
an
-eg
+He
aq
an
an
@@ -34438,7 +34684,7 @@ az
az
aq
an
-eg
+He
nS
an
bF
@@ -34448,7 +34694,7 @@ hp
js
hp
an
-eg
+He
aq
an
dB
@@ -34705,7 +34951,7 @@ an
an
an
an
-eg
+He
bh
an
dB
@@ -34952,7 +35198,7 @@ an
an
aU
an
-eg
+WD
eg
nV
ei
@@ -34962,7 +35208,7 @@ hr
hs
et
nV
-eg
+zF
aq
an
dB
@@ -35466,7 +35712,7 @@ an
an
aX
bf
-bb
+KS
an
bj
bH
@@ -35476,7 +35722,7 @@ aq
aq
aq
io
-bb
+KS
az
an
dB
@@ -35719,11 +35965,11 @@ ax
an
aF
cL
-aw
+sn
jC
-bb
-bb
-bb
+JZ
+JZ
+Hb
an
bk
bJ
@@ -35987,10 +36233,10 @@ an
an
aq
cp
+rV
eg
eg
-eg
-cQ
+ww
hI
an
dB
@@ -36230,8 +36476,8 @@ ac
ac
dB
ax
-ed
-aw
+WX
+DU
ed
hv
an
diff --git a/_maps/RandomZLevels/away_mission/jungleresort.dmm b/_maps/RandomZLevels/away_mission/jungleresort.dmm
index 4207080ac4..489bb7f1a8 100644
--- a/_maps/RandomZLevels/away_mission/jungleresort.dmm
+++ b/_maps/RandomZLevels/away_mission/jungleresort.dmm
@@ -2040,7 +2040,7 @@
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/machinery/power/port_gen/pacman/super,
+/obj/machinery/power/rtg,
/turf/open/floor/plating,
/area/awaymission/jungleresort)
"CA" = (
@@ -3720,7 +3720,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/power/port_gen/pacman/super,
+/obj/machinery/power/rtg,
/turf/open/floor/plating,
/area/awaymission/jungleresort)
"Yb" = (
diff --git a/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm b/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
index de2105e9d4..288adce2c3 100644
--- a/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
@@ -815,16 +815,16 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 351.9
+ initial_temperature = 351.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"bX" = (
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 351.9
+ initial_temperature = 351.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"bY" = (
@@ -2263,8 +2263,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"eK" = (
@@ -2634,8 +2634,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/central)
"fo" = (
@@ -2870,8 +2870,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/central)
"fK" = (
@@ -3049,8 +3049,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"gg" = (
@@ -3197,8 +3197,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"gC" = (
@@ -3411,8 +3411,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/research)
"he" = (
@@ -3422,8 +3422,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"hf" = (
@@ -3454,8 +3454,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"hi" = (
@@ -4789,8 +4789,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/gateway)
"jM" = (
@@ -4823,8 +4823,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/research)
"jR" = (
@@ -6606,8 +6606,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/gateway)
"mJ" = (
@@ -8072,12 +8072,10 @@
/obj/machinery/power/terminal{
dir = 1
},
-/obj/machinery/power/port_gen/pacman{
- name = "P.A.C.M.A.N.-type portable generator"
- },
/obj/structure/cable{
icon_state = "0-4"
},
+/obj/machinery/power/rtg,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -8086,9 +8084,6 @@
/obj/machinery/power/terminal{
dir = 1
},
-/obj/machinery/power/port_gen/pacman/super{
- name = "S.U.P.E.R.P.A.C.M.A.N.-type portable generator"
- },
/obj/item/wrench,
/obj/structure/cable{
icon_state = "0-8"
@@ -8096,6 +8091,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
+/obj/machinery/power/rtg,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -8104,12 +8100,10 @@
/obj/machinery/power/terminal{
dir = 1
},
-/obj/machinery/power/port_gen/pacman{
- name = "P.A.C.M.A.N.-type portable generator"
- },
/obj/structure/cable{
icon_state = "0-8"
},
+/obj/machinery/power/rtg,
/turf/open/floor/plating{
heat_capacity = 1e+006
},
@@ -8356,8 +8350,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"pv" = (
@@ -8367,8 +8361,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"pw" = (
@@ -8379,8 +8373,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/engineering)
"px" = (
@@ -8670,8 +8664,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"qb" = (
@@ -8902,8 +8896,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"qA" = (
@@ -8913,8 +8907,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"qB" = (
@@ -8924,8 +8918,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"qC" = (
@@ -11106,8 +11100,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"uc" = (
@@ -11752,8 +11746,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"vm" = (
@@ -11978,8 +11972,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/research)
"vI" = (
@@ -12264,8 +12258,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/mining)
"wk" = (
@@ -13483,8 +13477,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/mining)
"yh" = (
@@ -13492,8 +13486,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yi" = (
@@ -13501,8 +13495,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yj" = (
@@ -13512,8 +13506,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yk" = (
@@ -13522,8 +13516,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yl" = (
@@ -13533,8 +13527,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"ym" = (
@@ -13543,8 +13537,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yn" = (
@@ -13552,8 +13546,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yo" = (
@@ -13562,8 +13556,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yp" = (
@@ -13572,8 +13566,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yq" = (
@@ -13581,8 +13575,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yr" = (
@@ -13590,8 +13584,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yt" = (
@@ -13600,8 +13594,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yu" = (
@@ -13610,8 +13604,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yw" = (
@@ -13620,8 +13614,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yz" = (
@@ -13629,8 +13623,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yA" = (
@@ -13639,8 +13633,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yB" = (
@@ -13648,8 +13642,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yC" = (
@@ -13658,8 +13652,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yD" = (
@@ -13669,8 +13663,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"yH" = (
@@ -13680,8 +13674,8 @@
/turf/open/floor/plating/asteroid{
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
- name = "Cave Floor";
- initial_temperature = 363.9
+ initial_temperature = 363.9;
+ name = "Cave Floor"
},
/area/awaymission/undergroundoutpost45/caves)
"KE" = (
From c4070a41c0b8086fb972808a2504c0f91aa553d7 Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 00:52:41 -0600
Subject: [PATCH 05/28] working out the 'kinks' in Delta. haha get it?
---
_maps/map_files/Deltastation/DeltaStation2.dmm | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index d64abed5dc..e1aec15b61 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -2619,9 +2619,8 @@
/turf/closed/wall/r_wall,
/area/space/nearstation)
"ajs" = (
-/obj/structure/table,
-/obj/item/storage/briefcase,
/obj/effect/turf_decal/delivery,
+/obj/machinery/vending/kink,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ajt" = (
@@ -2880,15 +2879,17 @@
"ajR" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
-/obj/item/kirbyplants{
- icon_state = "plant-21"
- },
+/obj/structure/table,
+/obj/item/storage/briefcase,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ajS" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/item/kirbyplants{
+ icon_state = "plant-21"
+ },
/turf/open/floor/plasteel/cafeteria,
/area/hallway/secondary/entry)
"ajT" = (
@@ -96886,7 +96887,7 @@
/obj/item/folder/red,
/obj/item/toy/gun,
/obj/item/clothing/head/beret/sec{
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0);
+ armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0);
desc = "A replica beret resembling that of a special operations officer under Nanotrasen.";
name = "replica officer's beret"
},
@@ -98957,7 +98958,7 @@
name = "Replica CentCom officer's jumpsuit"
},
/obj/item/clothing/head/centhat{
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0);
+ armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0);
desc = "A replica hat of a Central Commander's attire. It has a small tag on it saying, 'It's good to be emperor.'";
name = "Replica CentCom hat"
},
@@ -114141,6 +114142,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
+/obj/machinery/vending/kink,
/turf/open/floor/plasteel,
/area/commons/fitness/recreation)
"sVM" = (
@@ -119427,7 +119429,7 @@
},
/obj/item/reagent_containers/food/drinks/beer{
desc = "Whatever it is, it reeks of foul, putrid froth.";
- list_reagents = list("bacchus_blessing" = 15);
+ list_reagents = list("bacchus_blessing"=15);
name = "Delta-Down";
pixel_x = 5;
pixel_y = 5
From 27181d1afdde63712c1630e963e23bb56fde0670 Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 01:15:36 -0600
Subject: [PATCH 06/28] Public paintings in library instead of generic empty
ones
---
_maps/map_files/OmegaStation/OmegaStation.dmm | 25 +++++++++++++++----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index a237802205..c0aa5c0a0e 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -23914,7 +23914,7 @@
c_tag = "Library 2";
dir = 4
},
-/obj/structure/sign/painting{
+/obj/structure/sign/painting/library{
pixel_y = 32
},
/turf/open/floor/plasteel/dark/side{
@@ -23925,6 +23925,9 @@
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/pen,
+/obj/structure/sign/painting/library{
+ pixel_x = 32
+ },
/turf/open/floor/plasteel/dark,
/area/service/library)
"aRV" = (
@@ -23996,6 +23999,9 @@
/obj/machinery/newscaster{
pixel_x = 32
},
+/obj/structure/sign/painting/library{
+ pixel_x = 32
+ },
/turf/open/floor/plasteel/dark/side{
dir = 10
},
@@ -24955,6 +24961,9 @@
/area/maintenance/port/aft)
"aUj" = (
/obj/machinery/photocopier,
+/obj/structure/sign/painting/library{
+ pixel_x = 32
+ },
/turf/open/floor/plasteel/dark/side{
dir = 10
},
@@ -26434,7 +26443,7 @@
/turf/closed/wall,
/area/service/library)
"aXg" = (
-/obj/structure/sign/painting{
+/obj/structure/sign/painting/library{
pixel_y = -32
},
/turf/open/floor/plasteel/dark/side{
@@ -26443,6 +26452,9 @@
/area/service/library)
"aXh" = (
/obj/machinery/light,
+/obj/structure/sign/painting/library{
+ pixel_y = -32
+ },
/turf/open/floor/plasteel/dark,
/area/service/library)
"aXi" = (
@@ -26460,7 +26472,7 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"aXj" = (
-/obj/structure/sign/painting{
+/obj/structure/sign/painting/library{
pixel_y = -32
},
/turf/open/floor/plasteel/dark,
@@ -26473,6 +26485,9 @@
c_tag = "Library 1";
dir = 8
},
+/obj/structure/sign/painting/library{
+ pixel_x = 32
+ },
/turf/open/floor/plasteel/dark/side{
dir = 10
},
@@ -35443,8 +35458,8 @@
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/pen,
-/obj/structure/sign/painting{
- pixel_x = -32
+/obj/structure/sign/painting/library{
+ step_x = -32
},
/turf/open/floor/plasteel/dark,
/area/service/library)
From a8c9d8201ee18d5145c4ab379c25690d43f504a9 Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 01:27:29 -0600
Subject: [PATCH 07/28] pixel instead of step
---
_maps/map_files/OmegaStation/OmegaStation.dmm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index c0aa5c0a0e..206d1cbc3c 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -35459,7 +35459,7 @@
/obj/item/folder,
/obj/item/pen,
/obj/structure/sign/painting/library{
- step_x = -32
+ pixel_x = -32
},
/turf/open/floor/plasteel/dark,
/area/service/library)
From 70dbad7055a433d964c6598ee55af42ffb756a56 Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 12:19:54 -0600
Subject: [PATCH 08/28] Tea dispensing fix
---
code/modules/food_and_drinks/recipes/drinks_recipes.dm | 8 ++++----
.../modules/reagents/chemistry/reagents/drink_reagents.dm | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 363e263ad4..217a650b30 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -771,8 +771,8 @@
/datum/chemical_reaction/pinkmilk
name = "Strawberry Milk"
- id = /datum/reagent/consumable/pinkmilk
- results = list(/datum/reagent/consumable/pinkmilk = 2)
+ id = /datum/reagent/consumable/milk/pinkmilk
+ results = list(/datum/reagent/consumable/milk/pinkmilk = 2)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/milk = 1)
mix_message = "You feel a sweet aroma drift up your nose as the lactic mixture swirls. It reminds you of... a cafeteria."
@@ -1016,8 +1016,8 @@
/datum/chemical_reaction/pinktea
name = "Strawberry Tea"
- id = /datum/reagent/consumable/pinktea
- results = list(/datum/reagent/consumable/pinktea = 5)
+ id = /datum/reagent/consumable/tea/pinktea
+ results = list(/datum/reagent/consumable/tea/pinktea = 5)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/catnip_tea
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 4376805e2c..c0892ce1e2 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -1034,7 +1034,7 @@
M.update_transform()
..()
-/datum/reagent/consumable/pinkmilk
+/datum/reagent/consumable/milk/pinkmilk
name = "Strawberry Milk"
description = "A drink of a bygone era of milk and artificial sweetener back on a rock."
color = "#f76aeb"//rgb(247, 106, 235)
@@ -1045,13 +1045,13 @@
glass_desc = "Delicious flavored strawberry syrup mixed with milk."
value = REAGENT_VALUE_VERY_COMMON
-/datum/reagent/consumable/tea/pinkmilk/on_mob_life(mob/living/carbon/M)
+/datum/reagent/consumable/milk/pinkmilk/on_mob_life(mob/living/carbon/M)
if(prob(15))
to_chat(M, "[pick("You cant help to smile.","You feel nostalgia all of sudden.","You remember to relax.")]")
..()
. = 1
-/datum/reagent/consumable/pinktea //Tiny Tim song
+/datum/reagent/consumable/tea/pinktea //Tiny Tim song
name = "Strawberry Tea"
description = "A timeless classic!"
color = "#f76aeb"//rgb(247, 106, 235)
From 2b0068e6384f4ae5343ae136a941b5b04f9b7cdb Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 14:41:50 -0600
Subject: [PATCH 09/28] Fixes cleanbots being invisible whenever they get
turned on or off
---
.../mob/living/simple_animal/bot/cleanbot.dm | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 0ad684ab4b..1300777620 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -19,6 +19,7 @@
path_image_color = "#993299"
weather_immunities = list("lava","ash")
+ var/base_icon = "cleanbot"
var/clean_time = 50 //How long do we take to clean?
var/upgrades = 0
@@ -126,13 +127,21 @@
/mob/living/simple_animal/bot/cleanbot/turn_on()
..()
- icon_state = "cleanbot[on]"
bot_core.updateUsrDialog()
+ update_icon()
/mob/living/simple_animal/bot/cleanbot/turn_off()
..()
- icon_state = "cleanbot[on]"
bot_core.updateUsrDialog()
+ update_icon()
+
+/mob/living/simple_animal/bot/cleanbot/update_icon_state()
+ . = ..()
+ switch(mode)
+ if(BOT_CLEANING)
+ icon_state = "[base_icon]-c"
+ else
+ icon_state = "[base_icon][on]"
/mob/living/simple_animal/bot/cleanbot/bot_reset()
..()
From ca414ca71255caf3abfb47142a495517be5d7476 Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 16:32:05 -0600
Subject: [PATCH 10/28] Grown inedibles now properly take seed stats into
account
---
code/modules/hydroponics/growninedible.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index c8c6195d5a..3c59deafdc 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -9,7 +9,7 @@
var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
var/tastes = list("indescribable" = 1) //Stops runtimes. Grown are un-eatable anyways so if you do then its a bug
-/obj/item/grown/Initialize(mapload, newloc, obj/item/seeds/new_seed)
+/obj/item/grown/Initialize(mapload, obj/item/seeds/new_seed)
. = ..()
create_reagents(50, NONE, HARVEST_REAGENTS_VALUE)
@@ -25,7 +25,7 @@
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
- T.on_new(src, newloc)
+ T.on_new(src, loc)
if(istype(src, seed.product)) // no adding reagents if it is just a trash item
seed.prepare_result(src)
From e1dbf15676bdd1191adc25f73ef5d0550b47d457 Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 17:15:21 -0600
Subject: [PATCH 11/28] Player-controlled cleanbots can now clean dirt
---
code/modules/mob/living/simple_animal/bot/cleanbot.dm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 0ad684ab4b..a1ddbe493d 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -381,6 +381,12 @@
target = null
mode = BOT_IDLE
icon_state = "cleanbot[on]"
+ else if(istype(A, /turf)) //for player-controlled cleanbots so they can clean unclickable messes like dirt
+ var/turf/T = A
+ for(var/atom/S in T.contents)
+ if(istype(S, /obj/effect/decal/cleanable)) //clean the first mess found
+ UnarmedAttack(S)
+ return
else if(istype(A, /obj/item) || istype(A, /obj/effect/decal/remains))
visible_message("[src] sprays hydrofluoric acid at [A]!")
playsound(src, 'sound/effects/spray2.ogg', 50, TRUE, -6)
From d820454ea5a8525f0f7235cfd0c0cabbf4bc3219 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Fri, 22 Jul 2022 18:19:56 -0500
Subject: [PATCH 12/28] Automatic changelog generation for PR #15712 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15712.yml | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15712.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15712.yml b/html/changelogs/AutoChangeLog-pr-15712.yml
new file mode 100644
index 0000000000..526d10bb21
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15712.yml
@@ -0,0 +1,7 @@
+author: "TripleShades"
+delete-after: True
+changes:
+ - rscdel: "Snow Cabin turbine"
+ - tweak: "Snow Cabin, Jungle Resort, and Plasma Outpost gateways now use RTGs for power generation"
+ - balance: "Snow Cabin SMES unit is now non-magical"
+ - bugfix: "Snow Cabin gateway wiring now connected properly"
From e8cdf35d5764379c614c8bcb962f74d3f4f39a76 Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 18:26:03 -0600
Subject: [PATCH 13/28] Using wirecutters on an autolathe will now have
appropriate behavior
---
code/game/machinery/autolathe.dm | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 35f45818b6..6511e2723d 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -298,6 +298,16 @@
wires.interact(user)
return STOP_ATTACK_PROC_CHAIN
+/obj/machinery/autolathe/wirecutter_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(busy)
+ balloon_alert(user, "it's busy!")
+ return STOP_ATTACK_PROC_CHAIN
+
+ if(panel_open)
+ wires.interact(user)
+ return STOP_ATTACK_PROC_CHAIN
+
/obj/machinery/autolathe/proc/AfterMaterialInsert(obj/item/item_inserted, id_inserted, amount_inserted)
if(istype(item_inserted, /obj/item/stack/ore/bluespace_crystal))
use_power(MINERAL_MATERIAL_AMOUNT / 10)
From ed5b20179bb3a47df9debc2a9248c6caec1f66a6 Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Sat, 23 Jul 2022 00:53:45 +0000
Subject: [PATCH 14/28] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-15712.yml | 7 -------
html/changelogs/archive/2022-07.yml | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-15712.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15712.yml b/html/changelogs/AutoChangeLog-pr-15712.yml
deleted file mode 100644
index 526d10bb21..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15712.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "TripleShades"
-delete-after: True
-changes:
- - rscdel: "Snow Cabin turbine"
- - tweak: "Snow Cabin, Jungle Resort, and Plasma Outpost gateways now use RTGs for power generation"
- - balance: "Snow Cabin SMES unit is now non-magical"
- - bugfix: "Snow Cabin gateway wiring now connected properly"
diff --git a/html/changelogs/archive/2022-07.yml b/html/changelogs/archive/2022-07.yml
index a34f7b7651..5e43742a2b 100644
--- a/html/changelogs/archive/2022-07.yml
+++ b/html/changelogs/archive/2022-07.yml
@@ -47,3 +47,10 @@
of runtimes.
- bugfix: The syndicate has fixed the radiation health analyzer allowing you to
check on the ui again.
+2022-07-23:
+ TripleShades:
+ - rscdel: Snow Cabin turbine
+ - tweak: Snow Cabin, Jungle Resort, and Plasma Outpost gateways now use RTGs for
+ power generation
+ - balance: Snow Cabin SMES unit is now non-magical
+ - bugfix: Snow Cabin gateway wiring now connected properly
From d9a3510512914f0897264f73b095e838507331b3 Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 23:05:14 -0600
Subject: [PATCH 15/28] Shocked autolathe will no longer infinitely zap you
with menu open
---
code/game/machinery/autolathe.dm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 35f45818b6..d18b5e54b5 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -62,14 +62,15 @@
if(!is_operational())
return
- if(shocked && !(stat & NOPOWER))
- shock(user,50)
-
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "Autolathe", capitalize(src.name))
ui.open()
+ if(shocked && !(stat & NOPOWER))
+ if(shock(user,50))
+ ui.close() //close the window if they got zapped successfully as to prevent them from getting zapped infinitely.
+
/obj/machinery/autolathe/ui_data(mob/user)
var/list/data = list()
data["materials"] = list()
From 82d0b15e6891e00585e036574f7dcc2f268d93b0 Mon Sep 17 00:00:00 2001
From: Cognition
Date: Fri, 22 Jul 2022 23:35:15 -0600
Subject: [PATCH 16/28] Fixes hierophant walls letting non-casters pass through
them
---
.../mob/living/simple_animal/hostile/megafauna/hierophant.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 04967f081d..086155d9a5 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -500,6 +500,8 @@ Difficulty: Normal
var/obj/item/projectile/P = mover
if(P.firer == caster)
return TRUE
+ if(mover != caster)
+ return FALSE
if(mover == caster)
return TRUE
From 3b3c43086111b2d00bc3a6053a22fbe1c05eddcd Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sat, 23 Jul 2022 01:27:10 -0500
Subject: [PATCH 17/28] Automatic changelog generation for PR #15711 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15711.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15711.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15711.yml b/html/changelogs/AutoChangeLog-pr-15711.yml
new file mode 100644
index 0000000000..226968d807
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15711.yml
@@ -0,0 +1,4 @@
+author: "Bhijn & Myr"
+delete-after: True
+changes:
+ - tweak: "The typo in Polly's name has been fixed, severing the decade-old reference to a 2012-era TGstation coder. If you know, you know."
From 42f14aaef261d65315fe9c9d0c55742790a2bac6 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 23 Jul 2022 14:28:09 -0700
Subject: [PATCH 18/28] Update code/modules/client/client_procs.dm
Co-authored-by: deathride58
---
code/modules/client/client_procs.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index b927e83b2c..66bb714b99 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -427,7 +427,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
add_admin_verbs()
var/admin_memo_note = get_message_output("memo")
if(admin_memo_note)
- to_chat(src, get_message_output("memo"))
+ to_chat(src, admin_memo_note)
adminGreet()
add_verbs_from_config()
From 0982319261c4aeac79039b6a6bf747468f746446 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sat, 23 Jul 2022 16:28:21 -0500
Subject: [PATCH 19/28] Automatic changelog generation for PR #15716 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15716.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15716.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15716.yml b/html/changelogs/AutoChangeLog-pr-15716.yml
new file mode 100644
index 0000000000..33884f2e80
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15716.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - bugfix: "Cleanbots will no longer go invisible when they get turned on or off."
From 7ccfc9970cd2b6603f6449333e24d081d7d758f0 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sat, 23 Jul 2022 16:28:29 -0500
Subject: [PATCH 20/28] Automatic changelog generation for PR #15714 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15714.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15714.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15714.yml b/html/changelogs/AutoChangeLog-pr-15714.yml
new file mode 100644
index 0000000000..1ac6f35ea8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15714.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - qol: "Public library paintings have been added to Omegastation. You can now submit paintings that will appear in later rounds on that station."
From 4f5b02723777c0ecb07d6e1167da1af8814ca7c9 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sat, 23 Jul 2022 16:28:46 -0500
Subject: [PATCH 21/28] Automatic changelog generation for PR #15713 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15713.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15713.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15713.yml b/html/changelogs/AutoChangeLog-pr-15713.yml
new file mode 100644
index 0000000000..761cc93cc0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15713.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - qol: "Two new Kinkmates have been added to Deltastation in the dorms and arrivals area."
From 9ae4768254f59320201386cf9eafe4b90567c426 Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Sun, 24 Jul 2022 00:56:57 +0000
Subject: [PATCH 22/28] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-15711.yml | 4 ----
html/changelogs/AutoChangeLog-pr-15713.yml | 4 ----
html/changelogs/AutoChangeLog-pr-15714.yml | 4 ----
html/changelogs/AutoChangeLog-pr-15716.yml | 4 ----
html/changelogs/archive/2022-07.yml | 10 ++++++++++
5 files changed, 10 insertions(+), 16 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-15711.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-15713.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-15714.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-15716.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15711.yml b/html/changelogs/AutoChangeLog-pr-15711.yml
deleted file mode 100644
index 226968d807..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15711.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Bhijn & Myr"
-delete-after: True
-changes:
- - tweak: "The typo in Polly's name has been fixed, severing the decade-old reference to a 2012-era TGstation coder. If you know, you know."
diff --git a/html/changelogs/AutoChangeLog-pr-15713.yml b/html/changelogs/AutoChangeLog-pr-15713.yml
deleted file mode 100644
index 761cc93cc0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15713.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - qol: "Two new Kinkmates have been added to Deltastation in the dorms and arrivals area."
diff --git a/html/changelogs/AutoChangeLog-pr-15714.yml b/html/changelogs/AutoChangeLog-pr-15714.yml
deleted file mode 100644
index 1ac6f35ea8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15714.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - qol: "Public library paintings have been added to Omegastation. You can now submit paintings that will appear in later rounds on that station."
diff --git a/html/changelogs/AutoChangeLog-pr-15716.yml b/html/changelogs/AutoChangeLog-pr-15716.yml
deleted file mode 100644
index 33884f2e80..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15716.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - bugfix: "Cleanbots will no longer go invisible when they get turned on or off."
diff --git a/html/changelogs/archive/2022-07.yml b/html/changelogs/archive/2022-07.yml
index 5e43742a2b..09651b7238 100644
--- a/html/changelogs/archive/2022-07.yml
+++ b/html/changelogs/archive/2022-07.yml
@@ -54,3 +54,13 @@
power generation
- balance: Snow Cabin SMES unit is now non-magical
- bugfix: Snow Cabin gateway wiring now connected properly
+2022-07-24:
+ Bhijn & Myr:
+ - tweak: The typo in Polly's name has been fixed, severing the decade-old reference
+ to a 2012-era TGstation coder. If you know, you know.
+ BlueWildrose:
+ - qol: Two new Kinkmates have been added to Deltastation in the dorms and arrivals
+ area.
+ - bugfix: Cleanbots will no longer go invisible when they get turned on or off.
+ - qol: Public library paintings have been added to Omegastation. You can now submit
+ paintings that will appear in later rounds on that station.
From d7c8e5b9a4ba91d77e8d2bdcd3535d29cac26f2d Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sun, 24 Jul 2022 00:38:22 -0500
Subject: [PATCH 23/28] Automatic changelog generation for PR #15721 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15721.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15721.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15721.yml b/html/changelogs/AutoChangeLog-pr-15721.yml
new file mode 100644
index 0000000000..30f07dd2bf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15721.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - bugfix: "Fixes hierophant walls letting non-casters pass through them."
From 860c5784ed224862f89767bff833e3ba919bacf1 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sun, 24 Jul 2022 00:38:41 -0500
Subject: [PATCH 24/28] Automatic changelog generation for PR #15715 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15715.yml | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15715.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15715.yml b/html/changelogs/AutoChangeLog-pr-15715.yml
new file mode 100644
index 0000000000..9a0ccf1dc0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15715.yml
@@ -0,0 +1,5 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - bugfix: "Tea now dispenses from dispensers again."
+ - bugfix: "Pink tea and Pink milk are pathed correctly."
From 7b3624b3265e75a35cd2cd5393931d7531125a0c Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sun, 24 Jul 2022 00:39:01 -0500
Subject: [PATCH 25/28] Automatic changelog generation for PR #15717 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15717.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15717.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15717.yml b/html/changelogs/AutoChangeLog-pr-15717.yml
new file mode 100644
index 0000000000..81cbd683aa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15717.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - bugfix: "Harvested grown inedibles now take their seed stats into account instead of acting like they got adminspawned."
From e92c6224c06ef04464aeef38664f082bc8b3e162 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sun, 24 Jul 2022 00:39:26 -0500
Subject: [PATCH 26/28] Automatic changelog generation for PR #15718 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15718.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15718.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15718.yml b/html/changelogs/AutoChangeLog-pr-15718.yml
new file mode 100644
index 0000000000..5951de67b4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15718.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - qol: "Player-controlled cleanbots can now clean messes that ordinarily wouldn't be clickable as long as they are clicking the tile it's on."
From f6df516371543c5841cf9e871e5e455fc3047c9d Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sun, 24 Jul 2022 00:39:50 -0500
Subject: [PATCH 27/28] Automatic changelog generation for PR #15719 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15719.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15719.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15719.yml b/html/changelogs/AutoChangeLog-pr-15719.yml
new file mode 100644
index 0000000000..a4251b4e4d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15719.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - bugfix: "Using wirecutters on an autolathe with an open panel will now have appropriate behavior of opening the wire menu."
From cfe1f3c7f209fcb54a7b1389d0361d823e95d2c7 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Sun, 24 Jul 2022 00:40:02 -0500
Subject: [PATCH 28/28] Automatic changelog generation for PR #15720 [ci skip]
---
html/changelogs/AutoChangeLog-pr-15720.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-15720.yml
diff --git a/html/changelogs/AutoChangeLog-pr-15720.yml b/html/changelogs/AutoChangeLog-pr-15720.yml
new file mode 100644
index 0000000000..ba99f303b0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15720.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - bugfix: "The shocked autolathe will no longer infinitely zap you with the menu open."