From ced3499065762e40231e5c018883f89d3ab6ba9c Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 29 Nov 2019 19:48:01 -0500 Subject: [PATCH 1/2] Merge pull request #6553 from Nalarac/ED209 Fixes Naming ED-209 and ED-CLN --- code/modules/mob/living/bot/ed209bot.dm | 3 +- code/modules/mob/living/bot/edCLNbot.dm | 5 ++-- html/changelogs/Nalarac - ED209.yml | 37 +++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/Nalarac - ED209.yml diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index 4db5978d0d..0d77e837f0 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -203,7 +203,8 @@ build_step++ to_chat(user, "You complete the ED-209.") var/turf/T = get_turf(src) - new /mob/living/bot/secbot/ed209(T,created_name,lasercolor) + var/mob/living/bot/secbot/ed209/S = new /mob/living/bot/secbot/ed209(T) + S.name = created_name user.drop_item() qdel(W) user.drop_from_inventory(src) diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm index 08d7d9ace6..13abfa8da3 100644 --- a/code/modules/mob/living/bot/edCLNbot.dm +++ b/code/modules/mob/living/bot/edCLNbot.dm @@ -3,7 +3,7 @@ desc = "A large cleaning robot. It looks rather efficient." icon_state = "edCLN0" req_one_access = list(access_robotics, access_janitor) - botcard_access = list(access_janitor, access_maint_tunnels) + botcard_access = list(access_janitor) locked = 0 // Start unlocked so roboticist can set them to patrol. wait_if_pulled = 0 // One big boi. @@ -229,7 +229,8 @@ build_step++ to_chat(user, "You complete the ED-CLN.") var/turf/T = get_turf(src) - new /mob/living/bot/cleanbot/edCLN(T,created_name) + var/mob/living/bot/cleanbot/edCLN/S = new /mob/living/bot/cleanbot/edCLN(T) + S.name = created_name user.drop_item() qdel(W) user.drop_from_inventory(src) diff --git a/html/changelogs/Nalarac - ED209.yml b/html/changelogs/Nalarac - ED209.yml new file mode 100644 index 0000000000..40a4ee8081 --- /dev/null +++ b/html/changelogs/Nalarac - ED209.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Nalarac + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "ED-209 and ED-CLN now properly accept names given with a pen." + - tweak: "Removed maintenance access from ED-CLN to prevent maintenance wandering." \ No newline at end of file