From 061f795d11ca54dd80cfb7542639e8f7710e8ed9 Mon Sep 17 00:00:00 2001 From: Den Date: Mon, 13 Apr 2015 21:50:08 +0300 Subject: [PATCH 01/22] Pipelayer Add Automatic pipelayer. Automatic Pipe Layer Pull or pusch to work. Use 1/4 metal to create 1 pipe and wrench it to place. Can make Regular, Scrubber, Supply or Heat exchange pipes (switch wrench). Dismantling the floor if necessary (switch crowbar). Can hold 1,000 sheets of metal (laying out a screwdriver). --- .../code/game/machinery/pipe/pipelayer.dm | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 Baystation12/code/game/machinery/pipe/pipelayer.dm diff --git a/Baystation12/code/game/machinery/pipe/pipelayer.dm b/Baystation12/code/game/machinery/pipe/pipelayer.dm new file mode 100644 index 0000000000..5262596f37 --- /dev/null +++ b/Baystation12/code/game/machinery/pipe/pipelayer.dm @@ -0,0 +1,145 @@ +/obj/machinery/pipelayer + + name = "Automatic pipe layer" + icon = 'icons/obj/stationobjs.dmi' + icon_state = "pipe_d" + density = 1 + var/turf/old_turf + var/old_dir + var/on = 0 + var/a_dis = 0 + var/P_type = 0 + var/P_type_t = "" + var/max_metal = 50 + var/metal = 10 + var/obj/item/weapon/wrench/W + +/obj/machinery/pipelayer/New() + W = new(src) + ..() + +/obj/machinery/pipelayer/Move(new_turf,M_Dir) + ..() + + if(on ||a_dis) + dismantleFloor(new_turf) + layPipe(old_turf,M_Dir,old_dir) + + old_turf = new_turf + old_dir = turn(M_Dir,180) + +/obj/machinery/pipelayer/attack_hand(mob/user as mob) + on=!on + visible_message("[src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated [src].") + return + +/obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) + + if (istype(W, /obj/item/weapon/wrench)) + switch(P_type) + if(31) + P_type = 0 + P_type_t = "regular pipes" + if(29) + P_type = 31 + P_type_t = "scrubbers pipes" + if(2) + P_type = 29 + P_type_t = "supply pipes" + if(0) + P_type = 2 + P_type_t = "heat exchange pipes" + + user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") + return + + if(istype(W, /obj/item/weapon/crowbar)) + a_dis=!a_dis + visible_message("[src] auto dismantle [!on?"dea":"a"]ctivated.") + return + + if(istype(W, /obj/item/stack/sheet/metal)) + + var/result = load_metal(W) + var/message + if(isnull(result)) + message = "Unable to load [W] - no metal found." + else if(!result) + message = "Stack is full." + else + message = "[result] scheets of metal successfully loaded." + + visible_message("[message]") + return + + if(istype(W, /obj/item/weapon/screwdriver)) + if(metal) + var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(metal,50)) as num, 1) + m = min(m, 50) + m = min(m, metal) + if(m) + use_metal(m) + var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) + MM.amount = m + else + user.visible_message("\The [src] is empty.") + return + ..() + +/obj/machinery/pipelayer/examine(mob/user) + ..() + user.visible_message("\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated.") + +/obj/machinery/pipelayer/proc/reset() + on=0 + return + +/obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/sheet/metal/MM) + if(istype(MM) && MM.get_amount()) + var/cur_amount = metal + var/to_load = max(max_metal - cur_amount,0) + if(to_load) + to_load = min(MM.get_amount(), to_load) + metal += to_load + MM.use(to_load) + return to_load + else + return 0 + return + +/obj/machinery/pipelayer/proc/use_metal(amount) + if(!metal || metal Date: Mon, 13 Apr 2015 21:54:16 +0300 Subject: [PATCH 02/22] Add pipelayer.dm to baystation12.dme --- baystation12.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/baystation12.dme b/baystation12.dme index 77596a3129..9119f2706d 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -467,6 +467,7 @@ #include "code\game\machinery\kitchen\smartfridge.dm" #include "code\game\machinery\pipe\construction.dm" #include "code\game\machinery\pipe\pipe_dispenser.dm" +#include "code\game\machinery\pipe\pipelayer.dm" #include "code\game\machinery\telecomms\broadcaster.dm" #include "code\game\machinery\telecomms\logbrowser.dm" #include "code\game\machinery\telecomms\machine_interactions.dm" From e5794adb9a162ba51b4712a87b4bc377b1f29650 Mon Sep 17 00:00:00 2001 From: Den Date: Tue, 14 Apr 2015 11:11:02 +0300 Subject: [PATCH 03/22] Fix pipelayer.dm path --- code/game/machinery/pipe/pipelayer.dm | 145 ++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 code/game/machinery/pipe/pipelayer.dm diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm new file mode 100644 index 0000000000..5262596f37 --- /dev/null +++ b/code/game/machinery/pipe/pipelayer.dm @@ -0,0 +1,145 @@ +/obj/machinery/pipelayer + + name = "Automatic pipe layer" + icon = 'icons/obj/stationobjs.dmi' + icon_state = "pipe_d" + density = 1 + var/turf/old_turf + var/old_dir + var/on = 0 + var/a_dis = 0 + var/P_type = 0 + var/P_type_t = "" + var/max_metal = 50 + var/metal = 10 + var/obj/item/weapon/wrench/W + +/obj/machinery/pipelayer/New() + W = new(src) + ..() + +/obj/machinery/pipelayer/Move(new_turf,M_Dir) + ..() + + if(on ||a_dis) + dismantleFloor(new_turf) + layPipe(old_turf,M_Dir,old_dir) + + old_turf = new_turf + old_dir = turn(M_Dir,180) + +/obj/machinery/pipelayer/attack_hand(mob/user as mob) + on=!on + visible_message("[src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated [src].") + return + +/obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) + + if (istype(W, /obj/item/weapon/wrench)) + switch(P_type) + if(31) + P_type = 0 + P_type_t = "regular pipes" + if(29) + P_type = 31 + P_type_t = "scrubbers pipes" + if(2) + P_type = 29 + P_type_t = "supply pipes" + if(0) + P_type = 2 + P_type_t = "heat exchange pipes" + + user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") + return + + if(istype(W, /obj/item/weapon/crowbar)) + a_dis=!a_dis + visible_message("[src] auto dismantle [!on?"dea":"a"]ctivated.") + return + + if(istype(W, /obj/item/stack/sheet/metal)) + + var/result = load_metal(W) + var/message + if(isnull(result)) + message = "Unable to load [W] - no metal found." + else if(!result) + message = "Stack is full." + else + message = "[result] scheets of metal successfully loaded." + + visible_message("[message]") + return + + if(istype(W, /obj/item/weapon/screwdriver)) + if(metal) + var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(metal,50)) as num, 1) + m = min(m, 50) + m = min(m, metal) + if(m) + use_metal(m) + var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) + MM.amount = m + else + user.visible_message("\The [src] is empty.") + return + ..() + +/obj/machinery/pipelayer/examine(mob/user) + ..() + user.visible_message("\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated.") + +/obj/machinery/pipelayer/proc/reset() + on=0 + return + +/obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/sheet/metal/MM) + if(istype(MM) && MM.get_amount()) + var/cur_amount = metal + var/to_load = max(max_metal - cur_amount,0) + if(to_load) + to_load = min(MM.get_amount(), to_load) + metal += to_load + MM.use(to_load) + return to_load + else + return 0 + return + +/obj/machinery/pipelayer/proc/use_metal(amount) + if(!metal || metal Date: Tue, 14 Apr 2015 11:11:49 +0300 Subject: [PATCH 04/22] Remove apl wisch bad path --- .../code/game/machinery/pipe/pipelayer.dm | 145 ------------------ 1 file changed, 145 deletions(-) delete mode 100644 Baystation12/code/game/machinery/pipe/pipelayer.dm diff --git a/Baystation12/code/game/machinery/pipe/pipelayer.dm b/Baystation12/code/game/machinery/pipe/pipelayer.dm deleted file mode 100644 index 5262596f37..0000000000 --- a/Baystation12/code/game/machinery/pipe/pipelayer.dm +++ /dev/null @@ -1,145 +0,0 @@ -/obj/machinery/pipelayer - - name = "Automatic pipe layer" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "pipe_d" - density = 1 - var/turf/old_turf - var/old_dir - var/on = 0 - var/a_dis = 0 - var/P_type = 0 - var/P_type_t = "" - var/max_metal = 50 - var/metal = 10 - var/obj/item/weapon/wrench/W - -/obj/machinery/pipelayer/New() - W = new(src) - ..() - -/obj/machinery/pipelayer/Move(new_turf,M_Dir) - ..() - - if(on ||a_dis) - dismantleFloor(new_turf) - layPipe(old_turf,M_Dir,old_dir) - - old_turf = new_turf - old_dir = turn(M_Dir,180) - -/obj/machinery/pipelayer/attack_hand(mob/user as mob) - on=!on - visible_message("[src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated [src].") - return - -/obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) - - if (istype(W, /obj/item/weapon/wrench)) - switch(P_type) - if(31) - P_type = 0 - P_type_t = "regular pipes" - if(29) - P_type = 31 - P_type_t = "scrubbers pipes" - if(2) - P_type = 29 - P_type_t = "supply pipes" - if(0) - P_type = 2 - P_type_t = "heat exchange pipes" - - user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") - return - - if(istype(W, /obj/item/weapon/crowbar)) - a_dis=!a_dis - visible_message("[src] auto dismantle [!on?"dea":"a"]ctivated.") - return - - if(istype(W, /obj/item/stack/sheet/metal)) - - var/result = load_metal(W) - var/message - if(isnull(result)) - message = "Unable to load [W] - no metal found." - else if(!result) - message = "Stack is full." - else - message = "[result] scheets of metal successfully loaded." - - visible_message("[message]") - return - - if(istype(W, /obj/item/weapon/screwdriver)) - if(metal) - var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(metal,50)) as num, 1) - m = min(m, 50) - m = min(m, metal) - if(m) - use_metal(m) - var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) - MM.amount = m - else - user.visible_message("\The [src] is empty.") - return - ..() - -/obj/machinery/pipelayer/examine(mob/user) - ..() - user.visible_message("\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated.") - -/obj/machinery/pipelayer/proc/reset() - on=0 - return - -/obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/sheet/metal/MM) - if(istype(MM) && MM.get_amount()) - var/cur_amount = metal - var/to_load = max(max_metal - cur_amount,0) - if(to_load) - to_load = min(MM.get_amount(), to_load) - metal += to_load - MM.use(to_load) - return to_load - else - return 0 - return - -/obj/machinery/pipelayer/proc/use_metal(amount) - if(!metal || metal Date: Tue, 14 Apr 2015 11:24:55 +0300 Subject: [PATCH 05/22] Fixes --- code/game/machinery/pipe/pipelayer.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 5262596f37..b02278a75c 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -1,6 +1,6 @@ /obj/machinery/pipelayer - name = "Automatic pipe layer" + name = "automatic pipe layer" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = 1 @@ -30,7 +30,7 @@ /obj/machinery/pipelayer/attack_hand(mob/user as mob) on=!on - visible_message("[src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated [src].") + visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") return /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) @@ -55,7 +55,7 @@ if(istype(W, /obj/item/weapon/crowbar)) a_dis=!a_dis - visible_message("[src] auto dismantle [!on?"dea":"a"]ctivated.") + visible_message("\The [src] auto dismantle [!on?"dea":"a"]ctivated.") return if(istype(W, /obj/item/stack/sheet/metal)) @@ -67,7 +67,7 @@ else if(!result) message = "Stack is full." else - message = "[result] scheets of metal successfully loaded." + message = "[result] schets of metal successfully loaded." visible_message("[message]") return @@ -82,7 +82,7 @@ var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) MM.amount = m else - user.visible_message("\The [src] is empty.") + user << "\The [src] is empty." return ..() From 16ddaf3d014bd66244997e2b676e2ff70b55bf6c Mon Sep 17 00:00:00 2001 From: Den Date: Tue, 14 Apr 2015 19:02:07 +0300 Subject: [PATCH 06/22] Fix "sheets", add \The, add round's --- code/game/machinery/pipe/pipelayer.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index b02278a75c..fd15dcb2e8 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -67,16 +67,17 @@ else if(!result) message = "Stack is full." else - message = "[result] schets of metal successfully loaded." + message = "[result] sheets of metal successfully loaded." visible_message("[message]") return if(istype(W, /obj/item/weapon/screwdriver)) if(metal) - var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(metal,50)) as num, 1) + var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(round(metal),50)) as num, 1) m = min(m, 50) - m = min(m, metal) + m = min(m, round(metal)) + m = round(m) if(m) use_metal(m) var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) @@ -97,7 +98,7 @@ /obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/sheet/metal/MM) if(istype(MM) && MM.get_amount()) var/cur_amount = metal - var/to_load = max(max_metal - cur_amount,0) + var/to_load = max(max_metal - round(cur_amount),0) if(to_load) to_load = min(MM.get_amount(), to_load) metal += to_load @@ -109,7 +110,7 @@ /obj/machinery/pipelayer/proc/use_metal(amount) if(!metal || metal Date: Thu, 16 Apr 2015 16:40:06 +0200 Subject: [PATCH 07/22] user << add user.visible_message() replace --- code/game/machinery/pipe/pipelayer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index fd15dcb2e8..17ccddf310 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -30,7 +30,7 @@ /obj/machinery/pipelayer/attack_hand(mob/user as mob) on=!on - visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") + user.visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") return /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) @@ -89,7 +89,7 @@ /obj/machinery/pipelayer/examine(mob/user) ..() - user.visible_message("\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated.") + user << "\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated." /obj/machinery/pipelayer/proc/reset() on=0 From 737b4fc08e0eeca25cfec7e988b6c425b4adeeb3 Mon Sep 17 00:00:00 2001 From: Den Date: Thu, 16 Apr 2015 16:42:57 +0200 Subject: [PATCH 08/22] dismantle Fix --- code/game/machinery/pipe/pipelayer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 17ccddf310..770b4941e1 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -21,7 +21,7 @@ /obj/machinery/pipelayer/Move(new_turf,M_Dir) ..() - if(on ||a_dis) + if(on && a_dis) dismantleFloor(new_turf) layPipe(old_turf,M_Dir,old_dir) From 6f77a98bc3f950d9f2616b4f4e23e6fd91486936 Mon Sep 17 00:00:00 2001 From: Den Date: Thu, 16 Apr 2015 20:15:40 +0200 Subject: [PATCH 09/22] Fix activating with no metal. --- code/game/machinery/pipe/pipelayer.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 770b4941e1..cf0a8fa8c5 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -29,6 +29,9 @@ old_dir = turn(M_Dir,180) /obj/machinery/pipelayer/attack_hand(mob/user as mob) + if(!metal) + user << "\The [src] don't work with no metal." + return on=!on user.visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") return From 1a000ea53ce769b471474efdb240c55380823f7e Mon Sep 17 00:00:00 2001 From: Den Date: Thu, 16 Apr 2015 20:54:12 +0200 Subject: [PATCH 10/22] Add rework switch to list of pipe types. --- code/game/machinery/pipe/pipelayer.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index cf0a8fa8c5..6a40d4f50a 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -13,6 +13,7 @@ var/max_metal = 50 var/metal = 10 var/obj/item/weapon/wrench/W + var/list/Pipes = list("regular pipes"=0,"scrubbers pipes"=31,"supply pipes"=29,"heat exchange pipes"=2) /obj/machinery/pipelayer/New() W = new(src) @@ -29,7 +30,7 @@ old_dir = turn(M_Dir,180) /obj/machinery/pipelayer/attack_hand(mob/user as mob) - if(!metal) + if(!metal&&!on) user << "\The [src] don't work with no metal." return on=!on @@ -39,6 +40,9 @@ /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) + P_type_t = input("Choose pipe type", "Pipe type") as null|anything in Pipes + P_type = Pipes[P_type_t] +/* switch(P_type) if(31) P_type = 0 @@ -52,7 +56,7 @@ if(0) P_type = 2 P_type_t = "heat exchange pipes" - +*/ user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") return From 1ff0eda6019d8279a2110be69f6f08ce243b76f6 Mon Sep 17 00:00:00 2001 From: Den Date: Fri, 17 Apr 2015 20:34:30 +0300 Subject: [PATCH 11/22] Change dismantle turf to pipe turf. --- code/game/machinery/pipe/pipelayer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 6a40d4f50a..aa7a0e5575 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -23,7 +23,7 @@ ..() if(on && a_dis) - dismantleFloor(new_turf) + dismantleFloor(old_turf) layPipe(old_turf,M_Dir,old_dir) old_turf = new_turf From f6d0ab15784febf579b188b80d8eb6953329329a Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 20 Apr 2015 14:42:43 +0200 Subject: [PATCH 12/22] Shower curtains no longer lose their default color upon being washed. NT has now invested in slightly less budget curtains. --- code/game/objects/structures/curtains.dm | 20 +++++++++++++++---- .../PsiOmegaDelta-DirtyEngineers.yml | 5 +++++ maps/exodus-1.dmm | 10 +++++----- 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/PsiOmegaDelta-DirtyEngineers.yml diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 741dc371db..fa1cd02b7b 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -1,14 +1,17 @@ +#define SHOWER_OPEN_LAYER MOB_LAYER + 0.1 +#define SHOWER_CLOSED_LAYER OBJ_LAYER + 0.4 + /obj/structure/curtain name = "curtain" icon = 'icons/obj/curtain.dmi' icon_state = "closed" - layer = MOB_LAYER + 0.1 + layer = SHOWER_OPEN_LAYER opacity = 1 density = 0 /obj/structure/curtain/open icon_state = "open" - layer = OBJ_LAYER + layer = SHOWER_CLOSED_LAYER opacity = 0 /obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone) @@ -27,10 +30,10 @@ opacity = !opacity if(opacity) icon_state = "closed" - layer = MOB_LAYER + 0.1 + layer = SHOWER_CLOSED_LAYER else icon_state = "open" - layer = OBJ_LAYER + layer = SHOWER_OPEN_LAYER /obj/structure/curtain/black name = "black curtain" @@ -45,3 +48,12 @@ name = "shower curtain" color = "#ACD1E9" alpha = 200 + +/obj/structure/curtain/open/shower/engineering + color = "#FFA500" + +/obj/structure/curtain/open/shower/security + color = "#AA0000" + +#undef SHOWER_OPEN_LAYER +#undef SHOWER_CLOSED_LAYER diff --git a/html/changelogs/PsiOmegaDelta-DirtyEngineers.yml b/html/changelogs/PsiOmegaDelta-DirtyEngineers.yml new file mode 100644 index 0000000000..2a4c1b6f7d --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-DirtyEngineers.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - bugfix: "Shower curtains no longer lose their default color upon being washed." diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index 59930ef9d8..e726a0567b 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -1088,7 +1088,7 @@ "auV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/arrivals) "auW" = (/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/wall,/area/maintenance/evahallway) "auX" = (/obj/structure/toilet{dir = 1},/turf/simulated/floor{icon_state = "bar"},/area/security/prison) -"auY" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) +"auY" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower/security,/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) "auZ" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) "ava" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) "avb" = (/obj/structure/table,/obj/item/weapon/paper_bin,/obj/machinery/camera{c_tag = "Common Brig Southwest"; dir = 4; network = list("SS13")},/obj/item/weapon/pen,/turf/simulated/floor,/area/security/prison) @@ -1140,7 +1140,7 @@ "avV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/crew_quarters/fitness) "avW" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/maintenance/evahallway) "avX" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/evahallway) -"avY" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) +"avY" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower/security,/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) "avZ" = (/obj/machinery/light/small,/obj/structure/mopbucket,/obj/item/weapon/mop,/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) "awa" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 30},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) "awb" = (/obj/structure/table,/obj/machinery/light{dir = 8},/obj/machinery/microwave,/turf/simulated/floor,/area/security/prison) @@ -4313,7 +4313,7 @@ "bEW" = (/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/camera{c_tag = "Messaging Server"; dir = 1},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_server_room) "bEX" = (/obj/machinery/camera{c_tag = "AI Upload Access"; dir = 1},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "bEY" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) -"bEZ" = (/obj/structure/window/basic{dir = 4},/obj/machinery/shower{dir = 1},/obj/structure/curtain/open/shower{color = "#FFA500"; layer = 3.3},/obj/machinery/door/window/northleft{name = "Shower"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/sleep/engi_wash) +"bEZ" = (/obj/structure/window/basic{dir = 8},/obj/machinery/shower{dir = 1},/obj/machinery/door/window/northright{name = "Shower"; req_access_txt = "0"},/obj/structure/curtain/open/shower/engineering,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/sleep/engi_wash) "bFa" = (/obj/machinery/light_switch{pixel_y = -25},/obj/machinery/camera{c_tag = "Cyborg Station"; dir = 1},/obj/structure/closet/crate{name = "Camera Assembly Crate"},/obj/item/weapon/camera_assembly,/obj/item/weapon/camera_assembly,/obj/item/weapon/camera_assembly,/obj/item/weapon/camera_assembly,/obj/item/weapon/camera_assembly,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_cyborg_station) "bFb" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/recharge_station,/turf/simulated/floor/bluegrid,/area/turret_protected/ai_cyborg_station) "bFc" = (/obj/machinery/recharge_station,/turf/simulated/floor/bluegrid,/area/turret_protected/ai_cyborg_station) @@ -4395,7 +4395,7 @@ "bGA" = (/obj/structure/disposalpipe/segment,/obj/machinery/camera{c_tag = "Cargo Bay Entrance"; dir = 8; network = list("SS13")},/turf/simulated/floor{dir = 4; icon_state = "bluecorner"},/area/hallway/primary/central_three) "bGB" = (/obj/machinery/status_display,/turf/simulated/wall,/area/hallway/primary/central_three) "bGC" = (/obj/machinery/door/airlock/command{name = "Head of Personnel"; req_access = null; req_access_txt = "57"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/central_three) -"bGD" = (/obj/structure/window/basic{dir = 8},/obj/machinery/shower{dir = 1},/obj/structure/curtain/open/shower{color = "#FFA500"; layer = 3.3},/obj/machinery/door/window/northright{name = "Shower"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/sleep/engi_wash) +"bGD" = (/obj/structure/window/basic{dir = 4},/obj/machinery/shower{dir = 1},/obj/machinery/door/window/northleft{name = "Shower"; req_access_txt = "0"},/obj/structure/curtain/open/shower/engineering,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/sleep/engi_wash) "bGE" = (/obj/machinery/door/airlock/multi_tile/glass{autoclose = 1; dir = 2; req_access_txt = "5"},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/medical/sleeper) "bGF" = (/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper) "bGG" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper) @@ -7469,7 +7469,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafccRccRcbiccTccScbnccUccWccVbYIccGccHccIccJccKccLccMccNccOccYccXcdaccZcdecdbcdBcdycdQcdFcekceecemcelcdccddaJEcdfcaqbTFcbIcdgcdhcdicdjcdkcdlcdmcdncdocdpcdqcdrcdscdtcaEcducdvcdwcaIbZxbWQcenbZycdxceobZAcdzcdAcepbZAcaPbYfbYfcaQbYccbYcbXcbZbYcchBccacjfcdLcdLbyFbBucdLcdOcdPceqcdRcdOcdSbBpbyecercdScdScdScdSbAebyebydcdScdSbXjcdXcdYcdZceacebcecbxTbycbycbycbycbycbycbycbycbycbycbycbycbycbycbycbyccefcegcegcehbKtbKtbLTbLTceibLTbLTbKtbKtaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamaafaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacejcejcejcejcejcejcejcetcesbYIbYIbYIbYIbYIbYJcevceuceuceucexcewbXzbXybYeceybYjceEceTceSceWceUceXbSUcezaJFceYaJFcaqbTFcbIceDcfacfacfaceFceGbTJceHceIbTJcbKcbNceJcbLcaEceKceLceMcaIbZxbWQceNbZyceOcePbZAbZAbZAbZAbZAccbceRbYfcaQbYcccdcccbYcbYcchBccecjfcdLceZcfbcfbcfccdOcfdcfecffcdOcfgcfhcfhcfjcficfucfkcflcfmcfncfocfpcdScfqcfrcfsbUnbUnbUnbUnaaaaafaaaaaaaaaaahaahaahaafaaaaaaaafaaaaaaaafaafaafcftcfBcfvbNebKsbKtbKtbLTbLUbLTbKtbKtaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamaafaafaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafcejcfwcfxcfycfzcfAcejcfDcfCcfFcfEcfHcfGcfIcfIcfKcfJcfJcfLcfMcbqbXzbXybYecfNcaicfOcfQcfPcfUcfRcggbSUaJFaJFcaqceBcaqbTFcbIcfVcfWcfWcfWcfXcbIcfYcfZcgacfYcgbcgccgdcgecaEcgfceLcgicaIcghccfcgjbZycgkcglbZycgmbLvbVicgnccgcchbYfccjcciccicckcclcclcclcclccmcdLcgocgycgycgzcgActscgrcgpcgucgtcgGcgGcgGcgxcgBcgIcgJcgCcgLcgDcgMcdScgNcgOcgPcgNaaaaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafcgQbKqbKqbKrbKsbKsbKtbKtbKtbKtbKuaafaafaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamaaaaafaafaafcgEcgEcgEcgEcgEcgEcgEcgEcgEcgEcgEcgEcgEaaaaaacgScgTcgTcgTcgUcgVcejcgHcgFcgRcgKcgXcgWcgZcgYchbchachdchcchfchechhchgchjchibSUbSUbSUbSUbSUbSUbSUbSUbEZbGDcaqbDfcaqbTFcbIcbIctpctqctrcbIcbIchrchschtcfYcaEcaEcaEcaEcaEcaIchkchlcaIchwccnchwbZychychmbZychAchBbVichCbVichDbYfccobYfbYfccpcdCcdCcdCcdDbYfcdLchIchJchJchKchnchMchochOchpchQckLckLchuchqchzchvckLckLckLchEchFcdSchZciachGcgNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamaaaaafaafaafcgEcgEcgEcgEcgEcgEcgEcgEcgEcgEcgEcgEcgEaaaaaacgScgTcgTcgTcgUcgVcejcgHcgFcgRcgKcgXcgWcgZcgYchbchachdchcchfchechhchgchjchibSUbSUbSUbSUbSUbSUbSUbSUbGDbEZcaqbDfcaqbTFcbIcbIctpctqctrcbIcbIchrchschtcfYcaEcaEcaEcaEcaEcaIchkchlcaIchwccnchwbZychychmbZychAchBbVichCbVichDbYfccobYfbYfccpcdCcdCcdCcdDbYfcdLchIchJchJchKchnchMchochOchpchQckLckLchuchqchzchvckLckLckLchEchFcdSchZciachGcgNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamaaaaaaaaaaaacgEchHchLchHcgEchNchPchNcgEchRchSchRcgEaaaaaaciicgTcgTcgUcgUcijcejchUchTchWchVchYchXcidciccifcieciecigciecbqbXzcihbYecikcimcilciocinciocipcirciqciqciAciAciAciAbTFciGciHciIciIciJciKciLciMciXciOciPciQciRciSciSciTciUcaIcaIcaIciVcdEckqbZybZybZybZychBchBbViciYbViciZbYfccobYfaaaaaaaaaaaaaaaaaaaaacdLcjgcisciucitcjjcjkcivcjmcjncjociwcjociycixcjrcjscgIcjtcgIciWcjucdScjacjwcjxcgNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamaaaaaaaaaaaacgEchHcjbchHcgEchNcjcchNcgEchRcjdchRcgEaaaaaaciicgTcgUcgUcgUcjBcjCcjhcjechWcjicjpcjlcjvcjqcjzcjycjDcjAcjEcbqbXzcjFchjcjGcjIcjHcjJcjJcjJcjKcjMcjLcjNceCcjOceAciAbTFciGckaciIckbckcckdcubckfckgckhctQckjckkcklciSckmciUcknckockpcjQcjPcdHcdGcdIcdIcdJcdIcdKbVibVibVibVibYfccobYfaaaaaaaaaaaaaaaaaaaaacdLckCcjRcjTcjSckEcdOckFcdOckGckHcjXcjUcjZcjYcgIcgIckecjUcjUckickOcdSckPckQckRcgNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamaaaaaaaaaaaacgEckrckuckscgEckzckBckAcgEckDckJckIcgEaaaaafciiclbcgTcgUcgUcgUcejckMckKchWchWckNchWchWchWchWckTcieckWckYcbqclackZcldclcclgcleclhclhclhclicljcljclkciAcllcgqclwclxciGclyciIclzclAclBclCclDclEclFclGclHclIclJciSclKciUclLclMclNclnclmclQclNclRclSclTbYfceQcdIcdIcdIcdIcdIcltbYfaaaaaaaaaaaaaaaaaaaaacdLcmacmbcmccmdcdOcmecmfcmgcdScmhcmicmiclOclvcmkcmlclPcmicmicmicmncdScmocmpcmqcmraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From 1b83666e2861af49d4545e7d4c6dbbbbd29f65d2 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 21 Apr 2015 18:10:31 +0200 Subject: [PATCH 13/22] Fixes #8931. Standardizes external airlock access. --- maps/exodus-1.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index 59930ef9d8..b1a817dbb9 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -1152,11 +1152,11 @@ "awh" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/item/clothing/head/soft/orange,/obj/item/clothing/shoes/sandal,/turf/simulated/floor,/area/security/prison) "awi" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "arrivals_airlock"; name = "interior access button"; pixel_x = -25; pixel_y = 25; req_access_txt = "13"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/arrivals) "awj" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/bedrooms) -"awk" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "eva_airlock"; name = "exterior access button"; pixel_x = 0; pixel_y = 25; req_access_txt = "1;11;18;24"},/turf/simulated/floor/plating/airless,/area/maintenance/evahallway) +"awk" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "eva_airlock"; name = "exterior access button"; pixel_x = 0; pixel_y = 25; req_access = list(13)},/turf/simulated/floor/plating/airless,/area/maintenance/evahallway) "awl" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe,/obj/item/clothing/suit/apron/overalls,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "awm" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/hallway/primary/fore) "awn" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) -"awo" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "eva_airlock"; name = "interior access button"; pixel_x = 0; pixel_y = 25; req_access_txt = "1;11;18;24"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/evahallway) +"awo" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "eva_airlock"; name = "interior access button"; pixel_x = 0; pixel_y = 25; req_access = list(13)},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/evahallway) "awp" = (/obj/machinery/seed_storage/garden,/turf/simulated/floor,/area/security/prison) "awq" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/hallway/secondary/entry/port) "awr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep) From bc6daf5b5fcfadc7f316f5aa67605a1e58615abb Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Wed, 22 Apr 2015 05:21:03 +0100 Subject: [PATCH 14/22] Fixes floor painter white-bot and white-delivery states Fixes #8937 --- code/game/objects/items/devices/floor_painter.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm index 84c03675b5..a1c21a7b3f 100644 --- a/code/game/objects/items/devices/floor_painter.dm +++ b/code/game/objects/items/devices/floor_painter.dm @@ -139,9 +139,9 @@ mode_nice = design mode = "whitebluegreencorners" tile_dir_mode = 2 - else if(design == "delivery" || design == "bot") + else if(design == "delivery" || design == "bot" || design == "white-delivery" || design == "white-bot") mode_nice = design - mode = design + mode = replacetext(design, "-", "") tile_dir_mode = 0 else if(design == "loadingarea") mode_nice = design From dc19c22056034b6bab8f43d8937045db879c6046 Mon Sep 17 00:00:00 2001 From: Dennok Date: Wed, 22 Apr 2015 11:27:18 +0300 Subject: [PATCH 15/22] Fix --- code/game/machinery/pipe/pipelayer.dm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index aa7a0e5575..205f05ae6b 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -42,27 +42,12 @@ if (istype(W, /obj/item/weapon/wrench)) P_type_t = input("Choose pipe type", "Pipe type") as null|anything in Pipes P_type = Pipes[P_type_t] -/* - switch(P_type) - if(31) - P_type = 0 - P_type_t = "regular pipes" - if(29) - P_type = 31 - P_type_t = "scrubbers pipes" - if(2) - P_type = 29 - P_type_t = "supply pipes" - if(0) - P_type = 2 - P_type_t = "heat exchange pipes" -*/ user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") return if(istype(W, /obj/item/weapon/crowbar)) a_dis=!a_dis - visible_message("\The [src] auto dismantle [!on?"dea":"a"]ctivated.") + visible_message("\The [src] auto dismantle [!a_dis?"dea":"a"]ctivated.") return if(istype(W, /obj/item/stack/sheet/metal)) From 4cc524265bfc10aa57c7e0355416da6eec0ed377 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 22 Apr 2015 12:27:28 +0200 Subject: [PATCH 16/22] Change of random virus targets. The random virus event will now only infect mobs on station and which currently have a player that has been active in the last 5 minutes. Placeholder until a more indepth discussion about what to do about the random event is concluded. --- code/modules/events/viral_infection.dm | 12 +++++++----- code/modules/mob/mob_helpers.dm | 4 ++++ html/changelogs/PsiOmegaDelta-GoingViral.yml | 5 +++++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/PsiOmegaDelta-GoingViral.yml diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index 55dbe2b823..639cea4d5e 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -4,12 +4,12 @@ datum/event/viral_infection datum/event/viral_infection/setup() announceWhen = rand(0, 3000) endWhen = announceWhen + 1 - + //generate 1-3 viruses. This way there's an upper limit on how many individual diseases need to be cured if many people are initially infected var/num_diseases = rand(1,3) for (var/i=0, i < num_diseases, i++) var/datum/disease2/disease/D = new /datum/disease2/disease - + var/strength = 1 //whether the disease is of the greater or lesser variety if (severity >= EVENT_LEVEL_MAJOR && prob(75)) strength = 2 @@ -24,7 +24,7 @@ datum/event/viral_infection/announce() level = pick("one", "two", "three", "four") else level = "five" - + if (severity == EVENT_LEVEL_MAJOR || prob(60)) command_announcement.Announce("Confirmed outbreak of level [level] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg') @@ -33,8 +33,10 @@ datum/event/viral_infection/start() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) - if(G.client && G.stat != DEAD) - candidates += G + if(G.stat != DEAD && G.is_client_active(5)) + var/turf/T = get_turf(G) + if(T.z in config.station_levels) + candidates += G if(!candidates.len) return candidates = shuffle(candidates)//Incorporating Donkie's list shuffle diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index a6585ff0de..7c220076bb 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -587,3 +587,7 @@ proc/is_blind(A) eyeobj.setLoc(C) return 1 + +// Returns true if the mob has a client which has been active in the last given X minutes. +/mob/proc/is_client_active(var/active = 1) + return client && client.inactivity < active MINUTES diff --git a/html/changelogs/PsiOmegaDelta-GoingViral.yml b/html/changelogs/PsiOmegaDelta-GoingViral.yml new file mode 100644 index 0000000000..02e569c78d --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-GoingViral.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - bugfix: "The virus event will now only infect mobs on the station, currently controlled by player that has been active in the last 5 minutes." From d27817903b29ee2454e7a0c3cb2069c3993c5592 Mon Sep 17 00:00:00 2001 From: Dennok Date: Wed, 22 Apr 2015 14:11:23 +0300 Subject: [PATCH 17/22] Create Dennok-PR-8838.yml --- html/changelogs/Dennok-PR-8838.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/Dennok-PR-8838.yml diff --git a/html/changelogs/Dennok-PR-8838.yml b/html/changelogs/Dennok-PR-8838.yml new file mode 100644 index 0000000000..f1a798e4e9 --- /dev/null +++ b/html/changelogs/Dennok-PR-8838.yml @@ -0,0 +1,5 @@ +author: Dennok +delete-after: True + +changes: + - rscadd: "Added a automatic Pipelayer. Work on pull/putting." From e68f9cec70e83e9a58e8c9e939113565a4cc2199 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Wed, 22 Apr 2015 15:05:38 +0100 Subject: [PATCH 18/22] Adjusts fruits and stuff to have more juice and stuff. --- code/modules/hydroponics/seed_datums.dm | 30 +++++++++++------------ html/changelogs/Yoshax-MoreFruitJuice.yml | 5 ++++ 2 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 html/changelogs/Yoshax-MoreFruitJuice.yml diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 13c73fbab1..cfbf024eda 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -38,7 +38,7 @@ seed_name = "berry" display_name = "berry bush" mutants = list("glowberries","poisonberries") - chems = list("nutriment" = list(1,10), "berryjuice" = list(1,10)) + chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10)) kitchen_tag = "berries" /datum/seed/berry/New() @@ -76,7 +76,7 @@ seed_name = "poison berry" display_name = "poison berry bush" mutants = list("deathberries") - chems = list("nutriment" = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(3,5)) + chems = list("nutriment" = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5)) /datum/seed/berry/poison/New() ..() @@ -138,7 +138,7 @@ seed_name = "tomato" display_name = "tomato plant" mutants = list("bluetomato","bloodtomato") - chems = list("nutriment" = list(1,10), "tomatojuice" = list(1,10)) + chems = list("nutriment" = list(1,10), "tomatojuice" = list(10,10)) kitchen_tag = "tomato" /datum/seed/tomato/New() @@ -196,7 +196,7 @@ seed_name = "bluespace tomato" display_name = "bluespace tomato plant" mutants = null - chems = list("nutriment" = list(1,20), "singulo" = list(1,5)) + chems = list("nutriment" = list(1,20), "singulo" = list(10,5)) /datum/seed/tomato/blue/teleport/New() ..() @@ -544,7 +544,7 @@ seed_name = "grape" display_name = "grapevines" mutants = list("greengrapes") - chems = list("nutriment" = list(1,10), "sugar" = list(1,5), "grapejuice" = list(1,10)) + chems = list("nutriment" = list(1,10), "sugar" = list(1,5), "grapejuice" = list(10,10)) /datum/seed/grapes/New() ..() @@ -563,7 +563,7 @@ seed_name = "green grape" display_name = "green grapevines" mutants = null - chems = list("nutriment" = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(1,10)) + chems = list("nutriment" = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10)) /datum/seed/grapes/green/New() ..() @@ -610,7 +610,7 @@ name = "banana" seed_name = "banana" display_name = "banana tree" - chems = list("banana" = list(1,10)) + chems = list("banana" = list(10,10)) trash_type = /obj/item/weapon/bananapeel kitchen_tag = "banana" @@ -648,7 +648,7 @@ name = "potato" seed_name = "potato" display_name = "potatoes" - chems = list("nutriment" = list(1,10), "potato" = list(1,10)) + chems = list("nutriment" = list(1,10), "potato" = list(10,10)) kitchen_tag = "potato" /datum/seed/potato/New() @@ -666,7 +666,7 @@ name = "soybean" seed_name = "soybean" display_name = "soybeans" - chems = list("nutriment" = list(1,20), "soymilk" = list(1,20)) + chems = list("nutriment" = list(1,20), "soymilk" = list(10,20)) kitchen_tag = "soybeans" /datum/seed/soybean/New() @@ -720,7 +720,7 @@ name = "carrot" seed_name = "carrot" display_name = "carrots" - chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(1,20)) + chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20)) kitchen_tag = "carrot" /datum/seed/carrots/New() @@ -790,7 +790,7 @@ name = "watermelon" seed_name = "watermelon" display_name = "watermelon vine" - chems = list("nutriment" = list(1,6), "watermelonjuice" = list(1,6)) + chems = list("nutriment" = list(1,6), "watermelonjuice" = list(10,6)) /datum/seed/watermelon/New() ..() @@ -828,7 +828,7 @@ name = "lime" seed_name = "lime" display_name = "lime trees" - chems = list("nutriment" = list(1,20), "limejuice" = list(1,20)) + chems = list("nutriment" = list(1,20), "limejuice" = list(10,20)) kitchen_tag = "lime" /datum/seed/citrus/New() @@ -847,7 +847,7 @@ name = "lemon" seed_name = "lemon" display_name = "lemon trees" - chems = list("nutriment" = list(1,20), "lemonjuice" = list(1,20)) + chems = list("nutriment" = list(1,20), "lemonjuice" = list(10,20)) kitchen_tag = "lemon" /datum/seed/citrus/lemon/New() @@ -860,7 +860,7 @@ seed_name = "orange" display_name = "orange trees" kitchen_tag = "orange" - chems = list("nutriment" = list(1,20), "orangejuice" = list(1,20)) + chems = list("nutriment" = list(1,20), "orangejuice" = list(10,20)) /datum/seed/citrus/orange/New() ..() @@ -906,7 +906,7 @@ seed_name = "cherry" seed_noun = "pits" display_name = "cherry tree" - chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(1,15)) + chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(10,15)) kitchen_tag = "cherries" /datum/seed/cherries/New() diff --git a/html/changelogs/Yoshax-MoreFruitJuice.yml b/html/changelogs/Yoshax-MoreFruitJuice.yml new file mode 100644 index 0000000000..555a177f0f --- /dev/null +++ b/html/changelogs/Yoshax-MoreFruitJuice.yml @@ -0,0 +1,5 @@ +author: Yoshax +delete-after: True + +changes: + - tweak: "Adjusts fruits and other stuff to have a minmum of 10 units of juice and stuff." \ No newline at end of file From 4ce1ec1f3dc6135aa2e2b43d7a5a1342083ca915 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 22 Apr 2015 16:49:54 +0200 Subject: [PATCH 19/22] Pipelayer feedback. Adds span use. Updates and adds visible messages as necessary. Corrects more instances where on was used instead of a_dis. --- code/game/machinery/pipe/pipelayer.dm | 21 ++++++++++----------- html/changelogs/Dennok-PR-8838.yml | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 205f05ae6b..32aafb21cd 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -31,10 +31,10 @@ /obj/machinery/pipelayer/attack_hand(mob/user as mob) if(!metal&&!on) - user << "\The [src] don't work with no metal." + user << "\The [src] doesn't work without metal." return on=!on - user.visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") + user.visible_message("[user] has [!on?"de":""]activated \the [src].", "You [!on?"de":""]activate \the [src].") return /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) @@ -42,26 +42,24 @@ if (istype(W, /obj/item/weapon/wrench)) P_type_t = input("Choose pipe type", "Pipe type") as null|anything in Pipes P_type = Pipes[P_type_t] - user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") + user.visible_message("[user] has set \the [src] to manufacture [P_type_t].", "You set \the [src] to manufacture [P_type_t].") return if(istype(W, /obj/item/weapon/crowbar)) a_dis=!a_dis - visible_message("\The [src] auto dismantle [!a_dis?"dea":"a"]ctivated.") + user.visible_message("[user] has [!a_dis?"de":""]activated auto-dismantling.", "You [!a_dis?"de":""]activate auto-dismantling.") return if(istype(W, /obj/item/stack/sheet/metal)) var/result = load_metal(W) - var/message if(isnull(result)) - message = "Unable to load [W] - no metal found." + user << "Unable to load [W] - no metal found." else if(!result) - message = "Stack is full." + user << "\The [src] is full." else - message = "[result] sheets of metal successfully loaded." + user.visible_message("[user] has loaded metal into \the [src].", "You load metal into \the [src]") - visible_message("[message]") return if(istype(W, /obj/item/weapon/screwdriver)) @@ -74,6 +72,7 @@ use_metal(m) var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) MM.amount = m + user.visible_message("[user] removes [m] sheet\s of metal from the \the [src].", "You remove [m] sheet\s of metal from \the [src]") else user << "\The [src] is empty." return @@ -81,7 +80,7 @@ /obj/machinery/pipelayer/examine(mob/user) ..() - user << "\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated." + user << "\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantling is [!a_dis?"de":""]activated." /obj/machinery/pipelayer/proc/reset() on=0 @@ -102,7 +101,7 @@ /obj/machinery/pipelayer/proc/use_metal(amount) if(!metal || metal Date: Thu, 23 Apr 2015 08:03:07 +0100 Subject: [PATCH 20/22] Fixes dionaea always using the verb "says". Not sure why, but speech_problem_flag is being set to 1 for dionaea, and only dionaea. Fixes #8952 --- code/modules/mob/living/carbon/human/say.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 20c5183d72..0554b44c6c 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -65,7 +65,7 @@ if(speech_problem_flag) if(!speaking || !(speaking.flags & NO_STUTTER)) - var/list/handle_r = handle_speech_problems(message) + var/list/handle_r = handle_speech_problems(message, verb) message = handle_r[1] verb = handle_r[2] speech_problem_flag = handle_r[3] @@ -271,10 +271,9 @@ return verb -/mob/living/carbon/human/proc/handle_speech_problems(var/message) +/mob/living/carbon/human/proc/handle_speech_problems(var/message, var/verb = "says") var/list/returns[3] - var/verb = "says" var/handled = 0 if(silent || (sdisabilities & MUTE)) message = "" From b9f8b0b8aa821426723d49de132eb19ff0b62eca Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Thu, 23 Apr 2015 13:29:24 +0200 Subject: [PATCH 21/22] Re-shuffles huma/say(). Removes non-existing map variables. --- code/modules/mob/living/carbon/human/say.dm | 6 ++++-- maps/exodus-1.dmm | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 9a980580fb..10a2dca6aa 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -128,10 +128,12 @@ return verb -/mob/living/carbon/human/proc/handle_speech_problems(var/message, var/verb = "says") +/mob/living/carbon/human/handle_speech_problems(var/message, var/verb) + if(!speech_problem_flag) + return ..() var/list/returns[3] - var/handled = 0 + speech_problem_flag = 0 if(silent || (sdisabilities & MUTE)) message = "" speech_problem_flag = 1 diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index 9fca5bc3eb..11b86a9bcf 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -5968,7 +5968,7 @@ "ckN" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/camera/network/engineering{c_tag = "Engineering Foyer"; dir = 8},/turf/simulated/floor{dir = 2; icon_state = "yellowcorner"},/area/engineering/foyer) "ckO" = (/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 30; pixel_y = 0},/turf/simulated/floor{tag = "icon-whitegreen_v (NORTHEAST)"; icon_state = "whitegreen_v"; dir = 5},/area/rnd/xenobiology/xenoflora) "ckP" = (/obj/machinery/power/solar_control{id = "starboardsolar"; name = "Aft Starboard Solar Control"; track = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplatecorner"},/area/maintenance/starboardsolar) -"ckQ" = (/obj/structure/window/basic{dir = 8},/obj/machinery/shower{dir = 1},/obj/machinery/door/window/northright{name = "Shower"; req_access_txt = "0"},/obj/structure/curtain/open/shower/engineering,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/sleep/engi_wash) +"ckQ" = (/obj/structure/window/basic{dir = 8},/obj/machinery/shower{dir = 1},/obj/machinery/door/window/northright{name = "Shower"; req_access = list()},/obj/structure/curtain/open/shower/engineering,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/sleep/engi_wash) "ckR" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/machinery/portable_atmospherics/canister/air/airlock,/turf/simulated/floor/plating{dir = 1; icon_state = "warnplatecorner"},/area/maintenance/starboardsolar) "ckS" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating/airless,/area/solar/starboard) "ckT" = (/obj/machinery/computer/station_alert,/turf/simulated/floor,/area/engineering/foyer) @@ -5983,7 +5983,7 @@ "clc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor{dir = 2; icon_state = "yellowcorner"},/area/engineering/foyer) "cld" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/engineering/foyer) "cle" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor,/area/engineering/locker_room) -"clf" = (/obj/structure/window/basic{dir = 4},/obj/machinery/shower{dir = 1},/obj/machinery/door/window/northleft{name = "Shower"; req_access_txt = "0"},/obj/structure/curtain/open/shower/engineering,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/sleep/engi_wash) +"clf" = (/obj/structure/window/basic{dir = 4},/obj/machinery/shower{dir = 1},/obj/machinery/door/window/northleft{name = "Shower"; req_access = list()},/obj/structure/curtain/open/shower/engineering,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/sleep/engi_wash) "clg" = (/obj/machinery/door_control{id = "engineering_cubicle"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 8; specialfunctions = 4},/obj/structure/toilet{dir = 1},/obj/machinery/light/small{dir = 4},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/sleep/engi_wash) "clh" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/engineering/locker_room) "cli" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/engineering/locker_room) From b693d65a17930e550ef872ab199be379863173d9 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Thu, 23 Apr 2015 13:54:19 +0200 Subject: [PATCH 22/22] Updates the changelog. --- html/changelog.html | 36 +++++++++++++++++++ html/changelogs/.all_changelog.yml | 36 +++++++++++++++++++ html/changelogs/Dennok-PR-8838.yml | 5 --- html/changelogs/Dennok-PR-8936.yml | 5 --- .../PsiOmegaDelta-DirtyEngineers.yml | 5 --- .../PsiOmegaDelta-FiredoorFixTwo.yml | 5 --- html/changelogs/PsiOmegaDelta-GoingViral.yml | 5 --- html/changelogs/PsiOmegaDelta-PR-8897.yml | 5 --- html/changelogs/PsiOmegaDelta-PR-8898.yml | 5 --- html/changelogs/PsiOmegaDelta-PR-8901.yml | 5 --- html/changelogs/PsiOmegaDelta-PR-8940.yml | 5 --- html/changelogs/PsiOmegaDelta.yml | 20 ++--------- html/changelogs/Yoshax-MoreFruitJuice.yml | 5 --- html/changelogs/__CHANGELOG_README.txt | 2 +- html/changelogs/example.yml | 4 +-- 15 files changed, 77 insertions(+), 71 deletions(-) delete mode 100644 html/changelogs/Dennok-PR-8838.yml delete mode 100644 html/changelogs/Dennok-PR-8936.yml delete mode 100644 html/changelogs/PsiOmegaDelta-DirtyEngineers.yml delete mode 100644 html/changelogs/PsiOmegaDelta-FiredoorFixTwo.yml delete mode 100644 html/changelogs/PsiOmegaDelta-GoingViral.yml delete mode 100644 html/changelogs/PsiOmegaDelta-PR-8897.yml delete mode 100644 html/changelogs/PsiOmegaDelta-PR-8898.yml delete mode 100644 html/changelogs/PsiOmegaDelta-PR-8901.yml delete mode 100644 html/changelogs/PsiOmegaDelta-PR-8940.yml delete mode 100644 html/changelogs/Yoshax-MoreFruitJuice.yml diff --git a/html/changelog.html b/html/changelog.html index 8d999fd9ec..5b3f43d174 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,42 @@ -->
+

23 April 2015

+

Dennok updated:

+
    +
  • Added an automatic pipelayer.
    • +
  • Added an automatic cablelayer.
    • +
+

PsiOmegaDelta updated:

+
    +
  • Shower curtains no longer lose their default color upon being washed.
    • +
  • Emergency shutters can again be examined, and from the proper distance.
    • +
  • The virus event will now only infect mobs on the station, currently controlled by player that has been active in the last 5 minutes.
    • +
  • Laptops now use the proper proc for checking camera status.
    • +
  • Makes it possible to eject PDA cartridges using a verb.
    • +
  • Makes it possible to shake tables with one's bare hands to stop climbers.
    • +
  • Added a mass driver door in disposals to prevent trash from floating out into space before proper ejection.
    • +
  • Rig/Hardsuit module tab - Less informative than the NanoUI hardsuit interface but allows quicker access to the various rig modules.
    • +
  • Silicons with the medical augmentation sensors enabled now also see alive/dead status if sensors are set accordingly.
    • +
  • Emergency shutters opened by silicons are now treated as having been forced open by a crowbar.
    • +
  • An active AI chassis can now be pushed, just as an empty chassis can be.
    • +
  • The AI can now use the crew monitor console to track crew members with full sensors enabled.
    • +
  • The AI now has a shortcut to track people holding up messages to cameras.
    • +
  • The AI now has a shortcut to track people sending PDA messages.
    • +
  • Multiple AIs can now share the same holopad.
    • +
  • Admin ghosts can now transfer other ghosts into mobs by drag-clicking.
    • +
  • Ghosts can now toggle seeing darkness and other ghosts separately.
    • +
  • Moving while dead now auto-ghosts you.
    • +
  • Two new random events: Space dust and gravitation failure.
    • +
  • Upgraded wizard spell interface and new spells.
    • +
  • More uplink items.
    • +
  • Uplink items now have rudimentary descriptions.
    • +
+

Yoshax updated:

+
    +
  • Adjusts fruits and other stuff to have a minmum of 10 units of juice and stuff.
    • +
+

18 April 2015

PsiOmegaDelta updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index a58c2bc21a..2650175e5c 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1567,3 +1567,39 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. PsiOmegaDelta: - rscadd: Added a changelog editing system that should cause fewer conflicts and more accurate timestamps. +2015-04-23: + Dennok: + - rscadd: Added an automatic pipelayer. + - rscadd: Added an automatic cablelayer. + PsiOmegaDelta: + - bugfix: Shower curtains no longer lose their default color upon being washed. + - bugfix: Emergency shutters can again be examined, and from the proper distance. + - bugfix: The virus event will now only infect mobs on the station, currently controlled + by player that has been active in the last 5 minutes. + - bugfix: Laptops now use the proper proc for checking camera status. + - rscadd: Makes it possible to eject PDA cartridges using a verb. + - rscadd: Makes it possible to shake tables with one's bare hands to stop climbers. + - bugfix: Added a mass driver door in disposals to prevent trash from floating out + into space before proper ejection. + - rscadd: Rig/Hardsuit module tab - Less informative than the NanoUI hardsuit interface + but allows quicker access to the various rig modules. + - rscadd: Silicons with the medical augmentation sensors enabled now also see alive/dead + status if sensors are set accordingly. + - rscadd: Emergency shutters opened by silicons are now treated as having been forced + open by a crowbar. + - rscadd: An active AI chassis can now be pushed, just as an empty chassis can be. + - rscadd: The AI can now use the crew monitor console to track crew members with + full sensors enabled. + - rscadd: The AI now has a shortcut to track people holding up messages to cameras. + - rscadd: The AI now has a shortcut to track people sending PDA messages. + - rscadd: Multiple AIs can now share the same holopad. + - rscadd: Admin ghosts can now transfer other ghosts into mobs by drag-clicking. + - rscadd: Ghosts can now toggle seeing darkness and other ghosts separately. + - rscadd: Moving while dead now auto-ghosts you. + - rscadd: 'Two new random events: Space dust and gravitation failure.' + - rscadd: Upgraded wizard spell interface and new spells. + - rscadd: More uplink items. + - rscadd: Uplink items now have rudimentary descriptions. + Yoshax: + - tweak: Adjusts fruits and other stuff to have a minmum of 10 units of juice and + stuff. diff --git a/html/changelogs/Dennok-PR-8838.yml b/html/changelogs/Dennok-PR-8838.yml deleted file mode 100644 index 9fe08cad0a..0000000000 --- a/html/changelogs/Dennok-PR-8838.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Dennok -delete-after: True - -changes: - - rscadd: "Added an automatic Pipelayer." diff --git a/html/changelogs/Dennok-PR-8936.yml b/html/changelogs/Dennok-PR-8936.yml deleted file mode 100644 index 6e190844dd..0000000000 --- a/html/changelogs/Dennok-PR-8936.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Dennok -delete-after: True - -changes: - - rscadd: "Added a automatic CableLayer." diff --git a/html/changelogs/PsiOmegaDelta-DirtyEngineers.yml b/html/changelogs/PsiOmegaDelta-DirtyEngineers.yml deleted file mode 100644 index 2a4c1b6f7d..0000000000 --- a/html/changelogs/PsiOmegaDelta-DirtyEngineers.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PsiOmegaDelta -delete-after: True - -changes: - - bugfix: "Shower curtains no longer lose their default color upon being washed." diff --git a/html/changelogs/PsiOmegaDelta-FiredoorFixTwo.yml b/html/changelogs/PsiOmegaDelta-FiredoorFixTwo.yml deleted file mode 100644 index da189fb8c1..0000000000 --- a/html/changelogs/PsiOmegaDelta-FiredoorFixTwo.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PsiOmegaDelta -delete-after: True - -changes: - - bugfix: "Emergency shutters can again be examined, and from the proper distance." diff --git a/html/changelogs/PsiOmegaDelta-GoingViral.yml b/html/changelogs/PsiOmegaDelta-GoingViral.yml deleted file mode 100644 index 02e569c78d..0000000000 --- a/html/changelogs/PsiOmegaDelta-GoingViral.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PsiOmegaDelta -delete-after: True - -changes: - - bugfix: "The virus event will now only infect mobs on the station, currently controlled by player that has been active in the last 5 minutes." diff --git a/html/changelogs/PsiOmegaDelta-PR-8897.yml b/html/changelogs/PsiOmegaDelta-PR-8897.yml deleted file mode 100644 index 5832ffb8d4..0000000000 --- a/html/changelogs/PsiOmegaDelta-PR-8897.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PsiOmegaDelta -delete-after: True - -changes: - - bugfix: "Laptops now use the proper proc for checking camera status." diff --git a/html/changelogs/PsiOmegaDelta-PR-8898.yml b/html/changelogs/PsiOmegaDelta-PR-8898.yml deleted file mode 100644 index 2d35c1aa71..0000000000 --- a/html/changelogs/PsiOmegaDelta-PR-8898.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PsiOmegaDelta -delete-after: True - -changes: - - rscadd: "Makes it possible to eject PDA cartridges using a verb." diff --git a/html/changelogs/PsiOmegaDelta-PR-8901.yml b/html/changelogs/PsiOmegaDelta-PR-8901.yml deleted file mode 100644 index 5fd81a14bc..0000000000 --- a/html/changelogs/PsiOmegaDelta-PR-8901.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PsiOmegaDelta -delete-after: True - -changes: - - rscadd: "Makes it possible to shake tables with one's bare hands to stop climbers." diff --git a/html/changelogs/PsiOmegaDelta-PR-8940.yml b/html/changelogs/PsiOmegaDelta-PR-8940.yml deleted file mode 100644 index a555d0ba43..0000000000 --- a/html/changelogs/PsiOmegaDelta-PR-8940.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PsiOmegaDelta -delete-after: True - -changes: - - bugfix: "Added a mass driver door in disposals to prevent trash from floating out into space before proper ejection." diff --git a/html/changelogs/PsiOmegaDelta.yml b/html/changelogs/PsiOmegaDelta.yml index f647f9b3a0..6fdea55f54 100644 --- a/html/changelogs/PsiOmegaDelta.yml +++ b/html/changelogs/PsiOmegaDelta.yml @@ -1,19 +1,3 @@ author: PsiOmegaDelta -delete-after: False - -changes: - - rscadd: Rig/Hardsuit module tab - Less informative than the NanoUI hardsuit interface but allows quicker access to the various rig modules. - - rscadd: Silicons with the medical augmentation sensors enabled now also see alive/dead status if sensors are set accordingly. - - rscadd: Emergency shutters opened by silicons are now treated as having been forced open by a crowbar. - - rscadd: An active AI chassis can now be pushed, just as an empty chassis can be. - - rscadd: The AI can now use the crew monitor console to track crew members with full sensors enabled. - - rscadd: The AI now has a shortcut to track people holding up messages to cameras. - - rscadd: The AI now has a shortcut to track people sending PDA messages. - - rscadd: Multiple AIs can now share the same holopad. - - rscadd: Admin ghosts can now transfer other ghosts into mobs by drag-clicking. - - rscadd: Ghosts can now toggle seeing darkness and other ghosts separately. - - rscadd: Moving while dead now auto-ghosts you. - - rscadd: Two new random events: Space dust and gravitation failure. - - rscadd: Upgraded wizard spell interface and new spells. - - rscadd: More uplink items. - - rscadd: Uplink items now have rudimentary descriptions. +changes: [] +delete-after: false diff --git a/html/changelogs/Yoshax-MoreFruitJuice.yml b/html/changelogs/Yoshax-MoreFruitJuice.yml deleted file mode 100644 index 555a177f0f..0000000000 --- a/html/changelogs/Yoshax-MoreFruitJuice.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Yoshax -delete-after: True - -changes: - - tweak: "Adjusts fruits and other stuff to have a minmum of 10 units of juice and stuff." \ No newline at end of file diff --git a/html/changelogs/__CHANGELOG_README.txt b/html/changelogs/__CHANGELOG_README.txt index 08d3f11735..6915dc47e2 100644 --- a/html/changelogs/__CHANGELOG_README.txt +++ b/html/changelogs/__CHANGELOG_README.txt @@ -4,7 +4,7 @@ Changelogs are included with commits as text .yml files created individually by TO MAKE A CHANGELOG .YML ENTRRY -1. Make a copy of the file example.yml in html/changelogs and rename it to [YOUR USERNAME]-PR-[YOUR PR NUMBER].yml (the pr and pr number are organizational and can be ignored if you so wish) +1. Make a copy of the file example.yml in html/changelogs and rename it to [YOUR USERNAME]-PR-[YOUR PR NUMBER].yml or [YOUR USERNAME]-[YOUR BRANCH NAME]. Only the username is strictly required, anything else is organizational and can be ignored if you so wish. 2. Change the author to yourself diff --git a/html/changelogs/example.yml b/html/changelogs/example.yml index 6b61a43693..413c15d19e 100644 --- a/html/changelogs/example.yml +++ b/html/changelogs/example.yml @@ -29,8 +29,8 @@ 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +# 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: - rscadd: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps." - rscdel: "Killed innocent kittens."