From 36218b61b95a3601d145058ffd7ccaf459b16983 Mon Sep 17 00:00:00 2001 From: Dip Date: Wed, 16 Sep 2020 19:09:36 -0300 Subject: [PATCH 1/2] Powered Microfan Craft Rework --- code/game/machinery/poweredfans.dm | 59 --------- .../machinery/poweredfans/fan_assembly.dm | 113 ++++++++++++++++++ .../game/machinery/poweredfans/poweredfans.dm | 62 ++++++++++ .../items/stacks/sheets/sheet_types.dm | 2 +- icons/obj/poweredfans.dmi | Bin 479 -> 575 bytes tgstation.dme | 3 +- 6 files changed, 178 insertions(+), 61 deletions(-) delete mode 100644 code/game/machinery/poweredfans.dm create mode 100644 code/game/machinery/poweredfans/fan_assembly.dm create mode 100644 code/game/machinery/poweredfans/poweredfans.dm diff --git a/code/game/machinery/poweredfans.dm b/code/game/machinery/poweredfans.dm deleted file mode 100644 index f10c7cb3..00000000 --- a/code/game/machinery/poweredfans.dm +++ /dev/null @@ -1,59 +0,0 @@ -/obj/machinery/poweredfans - icon = 'icons/obj/poweredfans.dmi' - icon_state = "mfan_powered" - name = "placeholder big fan" - desc = "A large machine releasing a constant gust of air." - anchored = TRUE - density = TRUE - var/buildstacktype = /obj/item/stack/sheet/metal - var/buildstackamount = 5 - CanAtmosPass = ATMOS_PASS_NO - -/obj/machinery/poweredfans/mpfan - name = "micro powered fan" - desc = "A handmade fan, releasing a thin gust of air." - layer = ABOVE_NORMAL_TURF_LAYER - density = FALSE - icon_state = "mfan_powered" - buildstackamount = 2 - use_power = ACTIVE_POWER_USE - idle_power_usage = 1 - active_power_usage = 3 - CanAtmosPass = ATMOS_PASS_NO - -/obj/machinery/poweredfans/deconstruct() - if(!(flags_1 & NODECONSTRUCT_1)) - if(buildstacktype) - new buildstacktype(loc,buildstackamount) - qdel(src) - -/obj/machinery/poweredfans/wrench_act(mob/living/user, obj/item/I) - if(flags_1 & NODECONSTRUCT_1) - return TRUE - - user.visible_message("[user] disassembles [src].", - "You start to disassemble [src]...", "You hear clanking and banging noises.") - if(I.use_tool(src, user, 20, volume=50)) - deconstruct() - return TRUE - -/obj/machinery/poweredfans/Initialize(mapload) - . = ..() - air_update_turf(1) - -/obj/machinery/poweredfans/power_change() - ..() - update_icon() - -/obj/machinery/poweredfans/update_icon() - //if(state & NOPOWER) - if(powered()) - icon_state = "mfan_powered" - CanAtmosPass = ATMOS_PASS_NO - air_update_turf(1) - return - else - icon_state = "mfan_unpowered" - CanAtmosPass = ATMOS_PASS_YES - air_update_turf(1) - return diff --git a/code/game/machinery/poweredfans/fan_assembly.dm b/code/game/machinery/poweredfans/fan_assembly.dm new file mode 100644 index 00000000..21744d24 --- /dev/null +++ b/code/game/machinery/poweredfans/fan_assembly.dm @@ -0,0 +1,113 @@ +/obj/structure/fan_assembly + name = "fan assembly" + desc = "A basic microfan assembly." + icon = 'icons/obj/poweredfans.dmi' + icon_state = "mfan_assembly" + max_integrity = 150 + var/state = 1 + var/buildstacktype = /obj/item/stack/sheet/metal + var/buildstackamount = 10 + /* + 1 = Wrenched in place + 2 = Welded in place + 3 = Wires attached to it + */ + +/obj/structure/fan_assembly/Initialize(mapload, ndir, building) + . = ..() + if(building) + setDir(ndir) + +/obj/structure/fan_assembly/Destroy() + return ..() + +/obj/structure/fan_assembly/attackby(obj/item/W, mob/living/user, params) + switch(state) + if(1) + // State 1 + if(istype(W, /obj/item/weldingtool)) + if(weld(W, user)) + to_chat(user, "You weld the fan assembly securely into place.") + setAnchored(TRUE) + state = 2 + update_icon() + return + if(2) + // State 2 + if(istype(W, /obj/item/stack/cable_coil)) + if(!W.tool_start_check(user, amount=2)) + to_chat(user, "You need two lengths of cable to wire the fan assembly!") + return + to_chat(user, "You start to add wires to the assembly...") + if(W.use_tool(src, user, 30, volume=50, amount=2)) + to_chat(user, "You add wires to the fan assembly.") + state = 3 + var/obj/machinery/poweredfans/F = new(loc, src) + forceMove(F) + F.setDir(src.dir) + return + else if(istype(W, /obj/item/weldingtool)) + if(weld(W, user)) + to_chat(user, "You unweld the fan assembly from its place.") + state = 1 + update_icon() + setAnchored(FALSE) + return + return ..() + +/obj/structure/fan_assembly/wirecutter_act(mob/user, obj/item/I) + if(state != 3) + return FALSE + + new /obj/item/stack/cable_coil(drop_location(), 2) + I.play_tool_sound(src) + to_chat(user, "You cut the wires from the circuits.") + state = 2 + update_icon() + return TRUE + +/obj/structure/fan_assembly/wrench_act(mob/user, obj/item/I) + if(state != 1) + return FALSE + user.visible_message("[user] disassembles [src].", + "You start to disassemble [src]...", "You hear wrenching noises.") + if(I.use_tool(src, user, 30, volume=50)) + deconstruct() + return TRUE + +/obj/structure/fan_assembly/proc/weld(obj/item/weldingtool/W, mob/living/user) + if(!W.tool_start_check(user, amount=0)) + return FALSE + switch(state) + if(1) + to_chat(user, "You start to weld \the [src]...") + if(2) + to_chat(user, "You start to unweld \the [src]...") + if(W.use_tool(src, user, 30, volume=50)) + return TRUE + return FALSE + +/obj/structure/fan_assembly/deconstruct(disassembled = TRUE) + if(!(flags_1 & NODECONSTRUCT_1)) + new buildstacktype(loc,buildstackamount) + qdel(src) + +/obj/structure/fan_assembly/examine(mob/user) + ..() + deconstruction_hints(user) + +/obj/structure/fan_assembly/proc/deconstruction_hints(mob/user) + switch(state) + if(1) + to_chat(user, "The fan assembly seems to be unwelded and loose.") + if(2) + to_chat(user, "The fan assembly seems to be welded, but missing wires.") + if(3) + to_chat(user, "The outer plating is wired firmly in place.") + +/obj/structure/fan_assembly/update_icon() + switch(state) + if(1) + icon_state = "mfan_assembly" + if(2) + icon_state = "mfan_welded" diff --git a/code/game/machinery/poweredfans/poweredfans.dm b/code/game/machinery/poweredfans/poweredfans.dm new file mode 100644 index 00000000..80c38ec6 --- /dev/null +++ b/code/game/machinery/poweredfans/poweredfans.dm @@ -0,0 +1,62 @@ +/obj/machinery/poweredfans + icon = 'icons/obj/poweredfans.dmi' + icon_state = "mfan_powered" + name = "micro powered fan" + desc = "A handmade fan, releasing a thin gust of air." + use_power = ACTIVE_POWER_USE + idle_power_usage = 5 + active_power_usage = 10 + layer = ABOVE_NORMAL_TURF_LAYER + anchored = TRUE + density = FALSE + CanAtmosPass = ATMOS_PASS_NO + var/obj/structure/fan_assembly/assembly = null + +/obj/machinery/poweredfans/deconstruct(disassembled = TRUE) + if(!(flags_1 & NODECONSTRUCT_1)) + if(disassembled) + if(!assembly) + assembly = new() + assembly.forceMove(drop_location()) + assembly.state = 2 + assembly.setAnchored(TRUE) + assembly.setDir(dir) + assembly = null + new /obj/item/stack/cable_coil(loc, 2) + else + new /obj/structure/fan_assembly (loc) + new /obj/item/stack/cable_coil(loc, 2) + qdel(src) + +/obj/machinery/poweredfans/wirecutter_act(mob/living/user, obj/item/I) + user.visible_message("[user] removes the wires from the [src].", + "You start to remove the wires from the [src]...", "You hear clanking and banging noises.") + if(I.use_tool(src, user, 30, volume=50)) + deconstruct() + return TRUE + +/obj/machinery/poweredfans/Initialize(mapload, obj/structure/fan_assembly/FA) + . = ..() + if(FA) + assembly = FA + else + assembly = new(src) + assembly.state = 3 + air_update_turf(1) + +/obj/machinery/poweredfans/power_change() + ..() + update_icon() + +/obj/machinery/poweredfans/update_icon() + //if(state & NOPOWER) + if(powered()) + icon_state = "mfan_powered" + CanAtmosPass = ATMOS_PASS_NO + air_update_turf(1) + return + else + icon_state = "mfan_unpowered" + CanAtmosPass = ATMOS_PASS_YES + air_update_turf(1) + return diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index db4816e9..c1aa1507 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -92,7 +92,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ null, \ new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \ - new/datum/stack_recipe("micro powered fan", /obj/machinery/poweredfans/mpfan, 2, time = 35, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("Micro Powered Fan Assembly", /obj/structure/fan_assembly, 10, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ )) /obj/item/stack/sheet/metal diff --git a/icons/obj/poweredfans.dmi b/icons/obj/poweredfans.dmi index 9e80ce43941d3af990fc48044a6e4976f1e6c0b7..9df1a4f81610ef1569854aa7db901db9fd267222 100644 GIT binary patch delta 422 zcmV;X0a^av1HS~27Y<+q0{{R35VmRy0000gktH7_{{R3-1O)&8|8;eB5fKuXvoQYv z0004WQchCwWv-j0003WNkl15QQg!?OY^|nm8`p=p@E{5FV`wstnt? zU6eXtbP^Z2g&V8MrK}>5nJ2I_xb!^O;;r^+e+K3wa@~_2ru6u1@bt2OVqQM|-&0Y? zb}c3fPTI#hN>61jb6RN6(zjL2!c%BB6@yRG^JkXdDdcXS)q-xXez5Jnk_uFtr~+H? zxI>wSL(4NWc)UXq+giU$P8VOvTnBTdT`t$1>t;T@9+*Y%C_X@^n+?495Ptqn z)F?h+FGXGqBM3k4*2s%x-|;trJV0KI0!SR>1qMb;Ltfw=keaiB7Z+d2TnFca%jL4k z+!aQB=bGjXO&Uv}?2r9vVF-lDZWpdE69MXvwt#g9^Bv5uWUhnvf7k6g1DTs*-a^ev QJOBUy07*qoM6N<$f;m69F8}}l delta 326 zcmV-M0lEIa1m6RY7Y;xK0{{R37aDIp0000aktH7<5fKvq002h>1m~w|3;+NC0d!JM zQvg8b*k%9#0EdxibbmCAW>RS$Ub76jloee4T)-{`0Pol_m*Gh@;{X5v)=5M`R7i>K zm9Y+jFc5}M6LwT4SzLG$;|mavlDLud5t=%i5T3||r<3vSzesEx>9_sRqve|1N0iwT zyCdxn37Jke=4<(TrmA!CE*@0ub#|STnVQf9f6 Date: Wed, 16 Sep 2020 20:50:15 -0300 Subject: [PATCH 2/2] Bugfixes, convert to machinery type. --- .../machinery/poweredfans/fan_assembly.dm | 40 +++++++++---------- .../game/machinery/poweredfans/poweredfans.dm | 5 +-- .../items/stacks/sheets/sheet_types.dm | 2 +- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/code/game/machinery/poweredfans/fan_assembly.dm b/code/game/machinery/poweredfans/fan_assembly.dm index 21744d24..8edd275f 100644 --- a/code/game/machinery/poweredfans/fan_assembly.dm +++ b/code/game/machinery/poweredfans/fan_assembly.dm @@ -1,9 +1,18 @@ -/obj/structure/fan_assembly +/obj/machinery/fan_assembly name = "fan assembly" desc = "A basic microfan assembly." icon = 'icons/obj/poweredfans.dmi' icon_state = "mfan_assembly" max_integrity = 150 + use_power = NO_POWER_USE + power_channel = ENVIRON + idle_power_usage = 0 + active_power_usage = 0 + max_integrity = 150 + layer = ABOVE_NORMAL_TURF_LAYER + anchored = FALSE + density = FALSE + CanAtmosPass = ATMOS_PASS_YES var/state = 1 var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 10 @@ -13,15 +22,15 @@ 3 = Wires attached to it */ -/obj/structure/fan_assembly/Initialize(mapload, ndir, building) +/obj/machinery/fan_assembly/Initialize(mapload, ndir, building) . = ..() if(building) setDir(ndir) -/obj/structure/fan_assembly/Destroy() +/obj/machinery/fan_assembly/Destroy() return ..() -/obj/structure/fan_assembly/attackby(obj/item/W, mob/living/user, params) +/obj/machinery/fan_assembly/attackby(obj/item/W, mob/living/user, params) switch(state) if(1) // State 1 @@ -55,18 +64,7 @@ return return ..() -/obj/structure/fan_assembly/wirecutter_act(mob/user, obj/item/I) - if(state != 3) - return FALSE - - new /obj/item/stack/cable_coil(drop_location(), 2) - I.play_tool_sound(src) - to_chat(user, "You cut the wires from the circuits.") - state = 2 - update_icon() - return TRUE - -/obj/structure/fan_assembly/wrench_act(mob/user, obj/item/I) +/obj/machinery/fan_assembly/wrench_act(mob/user, obj/item/I) if(state != 1) return FALSE user.visible_message("[user] disassembles [src].", @@ -75,7 +73,7 @@ deconstruct() return TRUE -/obj/structure/fan_assembly/proc/weld(obj/item/weldingtool/W, mob/living/user) +/obj/machinery/fan_assembly/proc/weld(obj/item/weldingtool/W, mob/living/user) if(!W.tool_start_check(user, amount=0)) return FALSE switch(state) @@ -87,16 +85,16 @@ return TRUE return FALSE -/obj/structure/fan_assembly/deconstruct(disassembled = TRUE) +/obj/machinery/fan_assembly/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) new buildstacktype(loc,buildstackamount) qdel(src) -/obj/structure/fan_assembly/examine(mob/user) +/obj/machinery/fan_assembly/examine(mob/user) ..() deconstruction_hints(user) -/obj/structure/fan_assembly/proc/deconstruction_hints(mob/user) +/obj/machinery/fan_assembly/proc/deconstruction_hints(mob/user) switch(state) if(1) to_chat(user, "The fan assembly seems to be unwelded and loose.") @@ -105,7 +103,7 @@ if(3) to_chat(user, "The outer plating is wired firmly in place.") -/obj/structure/fan_assembly/update_icon() +/obj/machinery/fan_assembly/update_icon() switch(state) if(1) icon_state = "mfan_assembly" diff --git a/code/game/machinery/poweredfans/poweredfans.dm b/code/game/machinery/poweredfans/poweredfans.dm index 80c38ec6..cb58d056 100644 --- a/code/game/machinery/poweredfans/poweredfans.dm +++ b/code/game/machinery/poweredfans/poweredfans.dm @@ -10,7 +10,7 @@ anchored = TRUE density = FALSE CanAtmosPass = ATMOS_PASS_NO - var/obj/structure/fan_assembly/assembly = null + var/obj/machinery/fan_assembly/assembly = null /obj/machinery/poweredfans/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) @@ -24,7 +24,6 @@ assembly = null new /obj/item/stack/cable_coil(loc, 2) else - new /obj/structure/fan_assembly (loc) new /obj/item/stack/cable_coil(loc, 2) qdel(src) @@ -35,7 +34,7 @@ deconstruct() return TRUE -/obj/machinery/poweredfans/Initialize(mapload, obj/structure/fan_assembly/FA) +/obj/machinery/poweredfans/Initialize(mapload, obj/machinery/fan_assembly/FA) . = ..() if(FA) assembly = FA diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index c1aa1507..a3c2dee4 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -92,7 +92,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ null, \ new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \ - new/datum/stack_recipe("Micro Powered Fan Assembly", /obj/structure/fan_assembly, 10, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("Micro Powered Fan Assembly", /obj/machinery/fan_assembly, 10, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ )) /obj/item/stack/sheet/metal