From 47319cc8c902ff04216bba066bce67d9f83d8f4e Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 8 May 2020 11:28:39 -0400 Subject: [PATCH 1/7] What if mechs give more information? --- code/game/mecha/mecha_construction_paths.dm | 39 +++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index de1c035000..f8905e7e7b 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -3,6 +3,45 @@ //////////////////////////////// /datum/component/construction/mecha var/base_icon + var/looky_helpy = TRUE + +/datum/component/construction/mecha/examine(mob/user) + . = ..() + if(looky_helpy) + if("key" == TOOL_WRENCH) + desc += "The mech could be wrenched into place." + if("key" == TOOL_SCREWDRIVER) + desc += "The mech could be screwed into place." + if("key" == TOOL_WIRECUTTER) + desc += "The mech wires could be trimmed into place." + if("key" == /obj/item/stack/cable_coil) + desc += "The mech could use some wiring." + if("key" == /obj/item/circuitboard) + desc += "The mech could use a type ofcircuitboard." + if("key" == /obj/item/stock_parts/scanning_module) + desc += "The mech could use a scanning stock part." + if("key" == /obj/item/stock_parts/capacitor) + desc += "The mech could use a power based stock part." + if("key" == /obj/item/stock_parts/cell) + desc += "The mech could use a power source." + if("key" == /obj/item/stack/sheet/metal) + desc += "The mech could use some sheets of metal." + if("key" == /obj/item/stack/sheet/plasteel) + desc += "The mech could use some sheets of strong steel." + if("key" == /obj/item/bikehorn) + desc += "HONK IT!." + if("key" == /obj/item/clothing/mask/gas/clown_hat) + desc += "GIVE IT CLOWN MAKEUP HONK!." + if("key" == /obj/item/clothing/shoes/clown_shoes) + desc += "GIVE IT GOOFY SHOES HONK HONK!." + if("key" == /obj/item/mecha_parts/part) + desc += "The mech could use a mech part." + if("key" == /obj/item/stack/ore/bluespace_crystal) + desc += "The mech could use a crystal of sorts." + if("key" == /obj/item/assembly/signaler/anomaly) + desc += "The mech could use a anomaly of sorts." + else + return /datum/component/construction/mecha/spawn_result() if(!result) From 9caa236e858713f19d4e09b976e8be52fae51fc1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 8 May 2020 14:22:15 -0400 Subject: [PATCH 2/7] Update mecha_construction_paths.dm --- code/game/mecha/mecha_construction_paths.dm | 65 +++++++++++---------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index f8905e7e7b..3d06a3d91a 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -8,38 +8,39 @@ /datum/component/construction/mecha/examine(mob/user) . = ..() if(looky_helpy) - if("key" == TOOL_WRENCH) - desc += "The mech could be wrenched into place." - if("key" == TOOL_SCREWDRIVER) - desc += "The mech could be screwed into place." - if("key" == TOOL_WIRECUTTER) - desc += "The mech wires could be trimmed into place." - if("key" == /obj/item/stack/cable_coil) - desc += "The mech could use some wiring." - if("key" == /obj/item/circuitboard) - desc += "The mech could use a type ofcircuitboard." - if("key" == /obj/item/stock_parts/scanning_module) - desc += "The mech could use a scanning stock part." - if("key" == /obj/item/stock_parts/capacitor) - desc += "The mech could use a power based stock part." - if("key" == /obj/item/stock_parts/cell) - desc += "The mech could use a power source." - if("key" == /obj/item/stack/sheet/metal) - desc += "The mech could use some sheets of metal." - if("key" == /obj/item/stack/sheet/plasteel) - desc += "The mech could use some sheets of strong steel." - if("key" == /obj/item/bikehorn) - desc += "HONK IT!." - if("key" == /obj/item/clothing/mask/gas/clown_hat) - desc += "GIVE IT CLOWN MAKEUP HONK!." - if("key" == /obj/item/clothing/shoes/clown_shoes) - desc += "GIVE IT GOOFY SHOES HONK HONK!." - if("key" == /obj/item/mecha_parts/part) - desc += "The mech could use a mech part." - if("key" == /obj/item/stack/ore/bluespace_crystal) - desc += "The mech could use a crystal of sorts." - if("key" == /obj/item/assembly/signaler/anomaly) - desc += "The mech could use a anomaly of sorts." + switch(key) + if(TOOL_WRENCH) + desc += "The mech could be wrenched into place." + if(TOOL_SCREWDRIVER) + desc += "The mech could be screwed into place." + if(TOOL_WIRECUTTER) + desc += "The mech wires could be trimmed into place." + if(/obj/item/stack/cable_coil) + desc += "The mech could use some wiring." + if(/obj/item/circuitboard) + desc += "The mech could use a type ofcircuitboard." + if(/obj/item/stock_parts/scanning_module) + desc += "The mech could use a scanning stock part." + if(/obj/item/stock_parts/capacitor) + desc += "The mech could use a power based stock part." + if(/obj/item/stock_parts/cell) + desc += "The mech could use a power source." + if(/obj/item/stack/sheet/metal) + desc += "The mech could use some sheets of metal." + if(/obj/item/stack/sheet/plasteel) + desc += "The mech could use some sheets of strong steel." + if(/obj/item/bikehorn) + desc += "HONK IT!." + if(/obj/item/clothing/mask/gas/clown_hat) + desc += "GIVE IT CLOWN MAKEUP HONK!." + if(/obj/item/clothing/shoes/clown_shoes) + desc += "GIVE IT GOOFY SHOES HONK HONK!." + if(/obj/item/mecha_parts/part) + desc += "The mech could use a mech part." + if(/obj/item/stack/ore/bluespace_crystal) + desc += "The mech could use a crystal of sorts." + if(/obj/item/assembly/signaler/anomaly) + desc += "The mech could use a anomaly of sorts." else return From 5ab1d04154a80ea14906fb766ab0e74a2760919a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 8 May 2020 14:44:27 -0400 Subject: [PATCH 3/7] Update mecha_construction_paths.dm --- code/game/mecha/mecha_construction_paths.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 3d06a3d91a..5fecfa49f2 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -41,8 +41,8 @@ desc += "The mech could use a crystal of sorts." if(/obj/item/assembly/signaler/anomaly) desc += "The mech could use a anomaly of sorts." - else - return + else + return /datum/component/construction/mecha/spawn_result() if(!result) From e0d56363d4c2807ee341fd9715fec116b8eee4b9 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 8 May 2020 15:13:13 -0400 Subject: [PATCH 4/7] Update mecha_construction_paths.dm --- code/game/mecha/mecha_construction_paths.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 5fecfa49f2..c3ac65e5c8 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -8,7 +8,7 @@ /datum/component/construction/mecha/examine(mob/user) . = ..() if(looky_helpy) - switch(key) + switch("key") if(TOOL_WRENCH) desc += "The mech could be wrenched into place." if(TOOL_SCREWDRIVER) From c9f8f559451f0ef9ba100bd087015cc9764269fd Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 8 May 2020 15:29:20 -0400 Subject: [PATCH 5/7] Update mecha_construction_paths.dm --- code/game/mecha/mecha_construction_paths.dm | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index c3ac65e5c8..3ba383de05 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -8,39 +8,39 @@ /datum/component/construction/mecha/examine(mob/user) . = ..() if(looky_helpy) - switch("key") + switch(steps[index]["key"]) if(TOOL_WRENCH) - desc += "The mech could be wrenched into place." + desc .+= "The mech could be wrenched into place." if(TOOL_SCREWDRIVER) - desc += "The mech could be screwed into place." + desc .+= "The mech could be screwed into place." if(TOOL_WIRECUTTER) - desc += "The mech wires could be trimmed into place." + desc .+= "The mech wires could be trimmed into place." if(/obj/item/stack/cable_coil) - desc += "The mech could use some wiring." + desc .+= "The mech could use some wiring." if(/obj/item/circuitboard) - desc += "The mech could use a type ofcircuitboard." + desc .+= "The mech could use a type ofcircuitboard." if(/obj/item/stock_parts/scanning_module) - desc += "The mech could use a scanning stock part." + desc .+= "The mech could use a scanning stock part." if(/obj/item/stock_parts/capacitor) - desc += "The mech could use a power based stock part." + desc .+= "The mech could use a power based stock part." if(/obj/item/stock_parts/cell) - desc += "The mech could use a power source." + desc .+= "The mech could use a power source." if(/obj/item/stack/sheet/metal) - desc += "The mech could use some sheets of metal." + desc .+= "The mech could use some sheets of metal." if(/obj/item/stack/sheet/plasteel) - desc += "The mech could use some sheets of strong steel." + desc .+= "The mech could use some sheets of strong steel." if(/obj/item/bikehorn) - desc += "HONK IT!." + desc .+= "HONK IT!." if(/obj/item/clothing/mask/gas/clown_hat) - desc += "GIVE IT CLOWN MAKEUP HONK!." + desc .+= "GIVE IT CLOWN MAKEUP HONK!." if(/obj/item/clothing/shoes/clown_shoes) - desc += "GIVE IT GOOFY SHOES HONK HONK!." + desc .+= "GIVE IT GOOFY SHOES HONK HONK!." if(/obj/item/mecha_parts/part) - desc += "The mech could use a mech part." + desc .+= "The mech could use a mech part." if(/obj/item/stack/ore/bluespace_crystal) - desc += "The mech could use a crystal of sorts." + desc .+= "The mech could use a crystal of sorts." if(/obj/item/assembly/signaler/anomaly) - desc += "The mech could use a anomaly of sorts." + desc .+= "The mech could use a anomaly of sorts." else return From a711f312ce1b015800b55d2b3b89aaab9878262f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 8 May 2020 15:37:17 -0400 Subject: [PATCH 6/7] Update mecha_construction_paths.dm --- code/game/mecha/mecha_construction_paths.dm | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 3ba383de05..8b92d1e4e5 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -10,37 +10,37 @@ if(looky_helpy) switch(steps[index]["key"]) if(TOOL_WRENCH) - desc .+= "The mech could be wrenched into place." + desc . += "The mech could be wrenched into place." if(TOOL_SCREWDRIVER) - desc .+= "The mech could be screwed into place." + desc . += "The mech could be screwed into place." if(TOOL_WIRECUTTER) - desc .+= "The mech wires could be trimmed into place." + desc . += "The mech wires could be trimmed into place." if(/obj/item/stack/cable_coil) - desc .+= "The mech could use some wiring." + desc . += "The mech could use some wiring." if(/obj/item/circuitboard) - desc .+= "The mech could use a type ofcircuitboard." + desc . += "The mech could use a type ofcircuitboard." if(/obj/item/stock_parts/scanning_module) - desc .+= "The mech could use a scanning stock part." + desc . += "The mech could use a scanning stock part." if(/obj/item/stock_parts/capacitor) - desc .+= "The mech could use a power based stock part." + desc . += "The mech could use a power based stock part." if(/obj/item/stock_parts/cell) - desc .+= "The mech could use a power source." + desc . += "The mech could use a power source." if(/obj/item/stack/sheet/metal) - desc .+= "The mech could use some sheets of metal." + desc . += "The mech could use some sheets of metal." if(/obj/item/stack/sheet/plasteel) - desc .+= "The mech could use some sheets of strong steel." + desc . += "The mech could use some sheets of strong steel." if(/obj/item/bikehorn) - desc .+= "HONK IT!." + desc . += "HONK IT!." if(/obj/item/clothing/mask/gas/clown_hat) - desc .+= "GIVE IT CLOWN MAKEUP HONK!." + desc . += "GIVE IT CLOWN MAKEUP HONK!." if(/obj/item/clothing/shoes/clown_shoes) - desc .+= "GIVE IT GOOFY SHOES HONK HONK!." + desc . += "GIVE IT GOOFY SHOES HONK HONK!." if(/obj/item/mecha_parts/part) - desc .+= "The mech could use a mech part." + desc . += "The mech could use a mech part." if(/obj/item/stack/ore/bluespace_crystal) - desc .+= "The mech could use a crystal of sorts." + desc . += "The mech could use a crystal of sorts." if(/obj/item/assembly/signaler/anomaly) - desc .+= "The mech could use a anomaly of sorts." + desc . += "The mech could use a anomaly of sorts." else return From 43f6acd81b11906746d3a6557019c892c887e1f4 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 8 May 2020 15:42:35 -0400 Subject: [PATCH 7/7] *crys* --- code/game/mecha/mecha_construction_paths.dm | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 8b92d1e4e5..19b6d0a9bd 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -10,37 +10,37 @@ if(looky_helpy) switch(steps[index]["key"]) if(TOOL_WRENCH) - desc . += "The mech could be wrenched into place." + . += "The mech could be wrenched into place." if(TOOL_SCREWDRIVER) - desc . += "The mech could be screwed into place." + . += "The mech could be screwed into place." if(TOOL_WIRECUTTER) - desc . += "The mech wires could be trimmed into place." + . += "The mech wires could be trimmed into place." if(/obj/item/stack/cable_coil) - desc . += "The mech could use some wiring." + . += "The mech could use some wiring." if(/obj/item/circuitboard) - desc . += "The mech could use a type ofcircuitboard." + . += "The mech could use a type ofcircuitboard." if(/obj/item/stock_parts/scanning_module) - desc . += "The mech could use a scanning stock part." + . += "The mech could use a scanning stock part." if(/obj/item/stock_parts/capacitor) - desc . += "The mech could use a power based stock part." + . += "The mech could use a power based stock part." if(/obj/item/stock_parts/cell) - desc . += "The mech could use a power source." + . += "The mech could use a power source." if(/obj/item/stack/sheet/metal) - desc . += "The mech could use some sheets of metal." + . += "The mech could use some sheets of metal." if(/obj/item/stack/sheet/plasteel) - desc . += "The mech could use some sheets of strong steel." + . += "The mech could use some sheets of strong steel." if(/obj/item/bikehorn) - desc . += "HONK IT!." + . += "HONK IT!." if(/obj/item/clothing/mask/gas/clown_hat) - desc . += "GIVE IT CLOWN MAKEUP HONK!." + . += "GIVE IT CLOWN MAKEUP HONK!." if(/obj/item/clothing/shoes/clown_shoes) - desc . += "GIVE IT GOOFY SHOES HONK HONK!." + . += "GIVE IT GOOFY SHOES HONK HONK!." if(/obj/item/mecha_parts/part) - desc . += "The mech could use a mech part." + . += "The mech could use a mech part." if(/obj/item/stack/ore/bluespace_crystal) - desc . += "The mech could use a crystal of sorts." + . += "The mech could use a crystal of sorts." if(/obj/item/assembly/signaler/anomaly) - desc . += "The mech could use a anomaly of sorts." + . += "The mech could use a anomaly of sorts." else return