From ac45be63a9db76a2e607ba9c95119c9186bb8c92 Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Sat, 7 Oct 2023 17:10:19 +0200 Subject: [PATCH 1/5] boop --- code/__DEFINES/computers.dm | 2 + code/modules/bitrunning/objects/bit_vendor.dm | 4 +- code/modules/bitrunning/objects/disks.dm | 8 +- .../modules/bitrunners/code/ability_disks.dm | 109 +++++++++++++++ .../bitrunners/code/combat_gear_disks.dm | 128 ++++++++++++++++++ .../bitrunners/icons/ability_disks.dmi | Bin 0 -> 987 bytes .../modules/bitrunners/icons/item_disks.dmi | Bin 0 -> 1163 bytes .../code/modules/bitrunners/readme.md | 42 ++++++ tgstation.dme | 2 + 9 files changed, 293 insertions(+), 2 deletions(-) create mode 100644 monkestation/code/modules/bitrunners/code/ability_disks.dm create mode 100644 monkestation/code/modules/bitrunners/code/combat_gear_disks.dm create mode 100644 monkestation/code/modules/bitrunners/icons/ability_disks.dmi create mode 100644 monkestation/code/modules/bitrunners/icons/item_disks.dmi create mode 100644 monkestation/code/modules/bitrunners/readme.md diff --git a/code/__DEFINES/computers.dm b/code/__DEFINES/computers.dm index ba3294ae6833..86bd44d30201 100644 --- a/code/__DEFINES/computers.dm +++ b/code/__DEFINES/computers.dm @@ -11,3 +11,5 @@ #define CATEGORY_BEPIS "Bepis Tech" #define CATEGORY_BITRUNNING_FLAIR "Misc" #define CATEGORY_BITRUNNING_TECH "Tech" +#define CATEGORY_BITRUNNING_COMBAT_GEAR "Combat gear" // monkeystation addition: bitrunning tech split up +#define CATEGORY_BITRUNNING_ABILITIES "Abilities" // monkeystation addition: bitrunning tech split up diff --git a/code/modules/bitrunning/objects/bit_vendor.dm b/code/modules/bitrunning/objects/bit_vendor.dm index 8db855cf62f9..a995c0c0b6a9 100644 --- a/code/modules/bitrunning/objects/bit_vendor.dm +++ b/code/modules/bitrunning/objects/bit_vendor.dm @@ -19,8 +19,10 @@ order_categories = list( CATEGORY_BITRUNNING_FLAIR, - CATEGORY_BITRUNNING_TECH, +// CATEGORY_BITRUNNING_TECH, Monkestation removal: split up into combat gear and abilities tabs CATEGORY_BEPIS, + CATEGORY_BITRUNNING_COMBAT_GEAR, + CATEGORY_BITRUNNING_ABILITIES, ) blackbox_key = "bitrunning" diff --git a/code/modules/bitrunning/objects/disks.dm b/code/modules/bitrunning/objects/disks.dm index b1cfab2078c0..30ac973749e4 100644 --- a/code/modules/bitrunning/objects/disks.dm +++ b/code/modules/bitrunning/objects/disks.dm @@ -13,9 +13,12 @@ /// Name of the choice made var/choice_made + var/monkeystation_override = FALSE // monkeystation change, override for disks with single powers/items + /obj/item/bitrunning_disk/Initialize(mapload) . = ..() - + if(monkeystation_override) // monkeystation change, override for disks with single powers/items + return icon_state = "[base_icon_state][rand(0, 7)]" update_icon() RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) @@ -29,6 +32,9 @@ examine_text += span_notice("To make a selection, toggle the disk in hand.") return + if(monkeystation_override) // monkeystation change, override for disks with single powers/items + return + examine_text += span_info("It has been used to select: [choice_made].") examine_text += span_notice("It cannot make another selection.") diff --git a/monkestation/code/modules/bitrunners/code/ability_disks.dm b/monkestation/code/modules/bitrunners/code/ability_disks.dm new file mode 100644 index 000000000000..33ab39e884a6 --- /dev/null +++ b/monkestation/code/modules/bitrunners/code/ability_disks.dm @@ -0,0 +1,109 @@ +/datum/orderable_item/bitrunning_abilities + category_index = CATEGORY_BITRUNNING_ABILITIES + +/obj/item/bitrunning_disk/ability/monkestation_override + name = "bitrunning program: someone forgot to give me a name, please help" + icon = 'monkestation/code/modules/bitrunners/icons/ability_disks.dmi' + icon_state = "i_am_error" + monkeystation_override = TRUE + +/obj/item/bitrunning_disk/ability/monkestation_override/Initialize(mapload) + granted_action = selectable_actions + RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + return ..() + +/** + * Tier 1 abilities + */ + +/datum/orderable_item/bitrunning_abilities/tier1 + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/ability/tier1 + + + +/datum/orderable_item/bitrunning_abilities/tier1/conjure_cheese + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/conjure_cheese + +/obj/item/bitrunning_disk/ability/monkestation_override/conjure_cheese + name = "bitrunning program: conjure cheese" + icon_state = "cheese" + selectable_actions = /datum/action/cooldown/spell/conjure/cheese + + + +/datum/orderable_item/bitrunning_abilities/tier1/basic_heal + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/basic_heal + +/obj/item/bitrunning_disk/ability/monkestation_override/basic_heal + name = "bitrunning program: basic heal" + icon_state = "heal" + selectable_actions = /datum/action/cooldown/spell/basic_heal + +/** + * Tier 2 abilities + */ + +/datum/orderable_item/bitrunning_abilities/tier2 + cost_per_order = 1500 + item_path = /obj/item/bitrunning_disk/item/tier2 + + + +/datum/orderable_item/bitrunning_abilities/tier2/fireball + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/fireball + +/obj/item/bitrunning_disk/ability/monkestation_override/fireball + name = "bitrunning program: fireball" + icon_state = "fireball" + selectable_actions = /datum/action/cooldown/spell/pointed/projectile/fireball + + + +/datum/orderable_item/bitrunning_abilities/tier2/lightningbolt + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/lightningbolt + +/obj/item/bitrunning_disk/ability/monkestation_override/lightningbolt + name = "bitrunning program: lightning bolt" + icon_state = "lightning" + selectable_actions = /datum/action/cooldown/spell/pointed/projectile/lightningbolt + + + +/datum/orderable_item/bitrunning_abilities/tier2/forcewall + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/forcewall + +/obj/item/bitrunning_disk/ability/monkestation_override/forcewall + name = "bitrunning program: forcewall" + icon_state = "forcewall" + selectable_actions = /datum/action/cooldown/spell/forcewall + + + +/** + * Tier 3 abilities + */ + +/datum/orderable_item/bitrunning_abilities/tier3 + cost_per_order = 2500 + item_path = /obj/item/bitrunning_disk/item/tier3 + + + +/datum/orderable_item/bitrunning_abilities/tier3/dragon + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/dragon + +/obj/item/bitrunning_disk/ability/monkestation_override/dragon + name = "bitrunning program: shapeshift, dragon" + icon_state = "dragon" + selectable_actions = /datum/action/cooldown/spell/shapeshift/dragon + + + +/datum/orderable_item/bitrunning_abilities/tier3/polar_bear + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/polar_bear + +/obj/item/bitrunning_disk/ability/monkestation_override/polar_bear + name = "bitrunning program: shapeshift, polar bear" + icon_state = "bear" + selectable_actions = /datum/action/cooldown/spell/shapeshift/polar_bear diff --git a/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm b/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm new file mode 100644 index 000000000000..aad46309e740 --- /dev/null +++ b/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm @@ -0,0 +1,128 @@ +/datum/orderable_item/bitrunning_combat_gear + category_index = CATEGORY_BITRUNNING_COMBAT_GEAR + + +/obj/item/bitrunning_disk/item/monkestation_override + name = "bitrunning gear: someone forgot to give me a name, please help" + icon = 'monkestation/code/modules/bitrunners/icons/item_disks.dmi' + icon_state = "i_am_error" + monkeystation_override = TRUE + +/obj/item/bitrunning_disk/item/monkestation_override/Initialize(mapload) + granted_item = selectable_items + RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + return ..() + +/** + * Tier 1 combat gear + */ + +/datum/orderable_item/bitrunning_combat_gear/tier1 + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/item/tier1 + + + +/datum/orderable_item/bitrunning_combat_gear/tier1/pizza + item_path = /obj/item/bitrunning_disk/item/monkestation_override/pizza + +/obj/item/bitrunning_disk/item/monkestation_override/pizza + name = "bitrunning gear: infinite pizzabox" + icon_state = "pizza" + selectable_items = /obj/item/pizzabox/infinite + + + +/datum/orderable_item/bitrunning_combat_gear/tier1/medbeam + item_path = /obj/item/bitrunning_disk/item/monkestation_override/medbeam + +/obj/item/bitrunning_disk/item/monkestation_override/medbeam + name = "bitrunning gear: Medical Beamgun" + icon_state = "beamgun" + selectable_items = /obj/item/gun/medbeam + + + +/datum/orderable_item/bitrunning_combat_gear/tier1/c4 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/c4 + +/obj/item/bitrunning_disk/item/monkestation_override/c4 + name = "bitrunning gear: C4 explosive charge" + icon_state = "c4" + selectable_items = /obj/item/grenade/c4 + +/** + * Tier 2 combat gear + */ + +/datum/orderable_item/bitrunning_combat_gear/tier2 + cost_per_order = 1800 + item_path = /obj/item/bitrunning_disk/item/tier2 + + + +/datum/orderable_item/bitrunning_combat_gear/tier2/chainsaw + item_path = /obj/item/bitrunning_disk/item/monkestation_override/chainsaw + +/obj/item/bitrunning_disk/item/monkestation_override/chainsaw + name = "bitrunning gear: chainsaw" + icon_state = "chainsaw" + selectable_items = /obj/item/chainsaw + + + +/datum/orderable_item/bitrunning_combat_gear/tier2/pistol + item_path = /obj/item/bitrunning_disk/item/monkestation_override/pistol + +/obj/item/bitrunning_disk/item/monkestation_override/pistol + name = "bitrunning gear: makarov pistol" + icon_state = "pistol" + selectable_items = /obj/item/gun/ballistic/automatic/pistol + + + +/datum/orderable_item/bitrunning_combat_gear/tier2/hardlight_blade + item_path = /obj/item/bitrunning_disk/item/monkestation_override/hardlight_blade + +/obj/item/bitrunning_disk/item/monkestation_override/hardlight_blade + name = "bitrunning gear: hardlight blade" + icon_state = "hardlight_blade" + selectable_items = /obj/item/melee/energy/blade/hardlight + +/** + * Tier 3 combat gear + */ + +/datum/orderable_item/bitrunning_combat_gear/tier3 + cost_per_order = 3200 + item_path = /obj/item/bitrunning_disk/item/tier3 + + + +/datum/orderable_item/bitrunning_combat_gear/tier3/tesla_cannon + item_path = /obj/item/bitrunning_disk/item/monkestation_override/tesla_cannon + +/obj/item/bitrunning_disk/item/monkestation_override/tesla_cannon + name = "bitrunning gear: tesla cannon" + icon_state = "tesla" + selectable_items = /obj/item/gun/energy/tesla_cannon + + + +/datum/orderable_item/bitrunning_combat_gear/tier3/dualsaber + item_path = /obj/item/bitrunning_disk/item/monkestation_override/dualsaber + +/obj/item/bitrunning_disk/item/monkestation_override/dualsaber + name = "bitrunning gear: double-bladed energy sword" + icon_state = "energy_blade" + selectable_items = /obj/item/dualsaber/green + + + +/datum/orderable_item/bitrunning_combat_gear/tier3/beesword + item_path = /obj/item/bitrunning_disk/item/monkestation_override/beesword + +/obj/item/bitrunning_disk/item/monkestation_override/beesword + name = "bitrunning gear: the stinger blade" + icon_state = "bee" + selectable_items = /obj/item/melee/beesword diff --git a/monkestation/code/modules/bitrunners/icons/ability_disks.dmi b/monkestation/code/modules/bitrunners/icons/ability_disks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b02e9b77bd4bb1f89303ed00456ae44872a17990 GIT binary patch literal 987 zcmV<110?*3P)004jp0{{R3ySg2`cWw;Cu#hW|0t0PQS~G1V-rfpPFha;|{!HG_Z)XB}Nv>%|<6BA|fJSIV z&otWZh}VhAa@QR8#N!|uZimKLX2D5c_fKQ%gQflx5H;GTf;{bMCmGfzf;Ig<>HC3K4+Ki0lRYlW=Q zYV~miu*IbZG|A%rpf9ocgXq3a2DAVG0(?nCK~#90?V0OxgCG!vNf0kh%*DR{yLJJ! z{o(F9P^3-HH+7~nr@F^QP)>~j008hJoKB~WUysv`Ia_-UG!0|W&2R;Z>c&{_&|2G& z#Z80GeP1C}Z(BN&^kA@|pN27L+z)uYBLtlcv~92G+vk(PCX!>Y>xMxw=z2wGu5aci zFg%5+2C036)J;jKEC2ui00000GN}DYuYU5^-V~{urv3SymjC7G{I>N+KF4m%-OhAM&i|a0 z54y{x<2LU54P@qjf_}YTh@r5-WPQ9{iOawl%*^ky^>G|;w;PRdCmBr7@3QsLJERt} z9SlQ|p5Nu`!5?*yHK^rx2i$-kVAf!pT|mzNoRSaDaQUK^&+X8){BK7-82PWSxJtK@_Hwy(AxH_rF@FH&`vqd%U{XFQl>fvQj5#C;MAm`Gr)|BSjYK+OIO?g8%>k0002IH?=?Mkq_?HKht!djV$}- z?TxcrWloo~l~CMgGY>volJp}Ce)?@c)lbsZ@FrW2^#duonvG<4c+PJ4cuv+2Fc|9# zLoDh?4DnJwNiRQ1mMO{^RP+O8v7R4FdhLJIARk0N2mk=@$rmajPQop4NxuL9002ov JPDHLkV1j$)(wqPQ literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/bitrunners/icons/item_disks.dmi b/monkestation/code/modules/bitrunners/icons/item_disks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a5f1b7fa284bc3ef8ca6cf6e4c01b6ed8bd20f8b GIT binary patch literal 1163 zcmV;61a$j}P)004jp0{{R3ySH03jhE|Nj90GXMZ)0RI300Ga;)Gynhp|1)O)Gyebp%>T^H z|NmwHz`($T`-PXheG&iw00DGTPE!Ct=GbNc007i_R9JLGWpiV4X>fFDZ*Bkpc$}4z zO$x#=5QW#xDMGsqqO~sFNQ=18E0n1jn?RD5Br1A(Qw#op8r;1ZzG2=xCZnrrz1h)n zyCEmEPIiVaX)&3SX$HIB=7-TAI&^21y*_0$)S{Ir#k{m2(9Q6bB zsCyN36zt{o3Q?*-(CyJgxqa~&2^Voxa2eX{l@}n5gY$n=y>z})Q8NN8S3`_-qkzYw z@aWW+D2k_(1)H%qH)zndmtQ+x?#S6&s$WfIwAz*TC%FOZo}BDYNA$1&00S3EL_t(| zob8+IZlo{_g}G%yONX*ly#K4N?EvkM9D4*}GTZghbX4`o$(MiwvC^t?xm+&SFHv3B znO~phS5?!tji~DYU|5AZxYVzzmI>Ro?Fcao7{Yf8dH*KDz7-!y$QQtlJ{T?obTieFk@U3|4 z+x5BBf30l1>wN?$Uf;O)z2=+sIS!m>4KUR6oDf0#Qnr9T7j`T_tv*K+KhG-x0AybS zWC>y3|0aZhUthRBw*t%%FbzOP0OHsB74&yP4G`An!cL&w0%-(U|8@&8G#cPe2m!VF zT-XS3`7Dh9`P6shPP8Nm&@gHxm+%n>x@dj(*KV7UU+uv1EkHYdBLsl^0O37kc3|9tW_+mSKFkBI?Q{sHh@ar`ytD=wS$J-l zc_ + +https://github.com/CODEBASE/CODEBASE/pull/ + +## \ <!--Title of your addition.--> + +Module ID: <!-- Uppercase, UNDERSCORE_CONNECTED name of your module, that you use to mark files. This is so people can case-sensitive search for your edits, if any. --> + +### Description: + +<!-- Here, try to describe what your PR does, what features it provides and any other directly useful information. --> + +### TG Proc/File Changes: + +- N/A +<!-- If you edited any core procs, you should list them here. You should specify the files and procs you changed. +E.g: +- `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var` +--> + +### Modular Overrides: + +- N/A +<!-- If you added a new modular override (file or code-wise) for your module, you should list it here. Code files should specify what procs they changed, in case of multiple modules using the same file. +E.g: +- `modular_skyrat/master_files/sound/my_cool_sound.ogg` +- `modular_skyrat/master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var` +--> + +### Defines: + +- computers.dm +<!-- If you needed to add any defines, mention the files you added those defines in, along with the name of the defines. --> + +### Included files that are not contained in this module: + +- N/A +<!-- Likewise, be it a non-modular file or a modular one that's not contained within the folder belonging to this specific module, it should be mentioned here. Good examples are icons or sounds that are used between multiple modules, or other such edge-cases. --> + +### Credits: + +<!-- Here go the credits to you, dear coder, and in case of collaborative work or ports, credits to the original source of the code. --> diff --git a/tgstation.dme b/tgstation.dme index ff9d8f7cc8d2..d22632356519 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5670,6 +5670,8 @@ #include "monkestation\code\modules\antimatter\code\shielding.dm" #include "monkestation\code\modules\ballpit\ballbit_sink.dm" #include "monkestation\code\modules\ballpit\ballpit.dm" +#include "monkestation\code\modules\bitrunners\code\ability_disks.dm" +#include "monkestation\code\modules\bitrunners\code\combat_gear_disks.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker_assets.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker\bloodsucker_conversion.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker\bloodsucker_datum.dm" From 26d4f94e1d1f793241f21b5064c8a793e11f8067 Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Sat, 7 Oct 2023 17:30:52 +0200 Subject: [PATCH 2/5] Update readme.md --- .../code/modules/bitrunners/readme.md | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/monkestation/code/modules/bitrunners/readme.md b/monkestation/code/modules/bitrunners/readme.md index b0dbbe80eef9..e943f8723dd9 100644 --- a/monkestation/code/modules/bitrunners/readme.md +++ b/monkestation/code/modules/bitrunners/readme.md @@ -1,42 +1,33 @@ -<!-- This should be copy-pasted into the root of your module folder as readme.md --> -https://github.com/CODEBASE/CODEBASE/pull/<!--PR Number--> +https://github.com/Monkestation/Monkestation2.0/pull/429 -## \<Title Here> <!--Title of your addition.--> +## \<Tha bitrunner PR: Splits the Technology disk tab into combat gear and abilities tabs, seperates all the disk choices into seperate disks> -Module ID: <!-- Uppercase, UNDERSCORE_CONNECTED name of your module, that you use to mark files. This is so people can case-sensitive search for your edits, if any. --> +BIT_RUNNERS ID: ### Description: -<!-- Here, try to describe what your PR does, what features it provides and any other directly useful information. --> +This modular file is for all things related to bitrunners, the PR that it started with is the title ### TG Proc/File Changes: -- N/A -<!-- If you edited any core procs, you should list them here. You should specify the files and procs you changed. -E.g: -- `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var` ---> +<!-- Added an override for initialize, so we can get custom icons and remove un-needed descriptions. Along with changing the order categories --> +-code/modules/bitrunning/objects/bit_vendor.dm ### Modular Overrides: - N/A -<!-- If you added a new modular override (file or code-wise) for your module, you should list it here. Code files should specify what procs they changed, in case of multiple modules using the same file. -E.g: -- `modular_skyrat/master_files/sound/my_cool_sound.ogg` -- `modular_skyrat/master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var` ---> ### Defines: +<!-- Added defines so the order vendor functions properly --> - computers.dm -<!-- If you needed to add any defines, mention the files you added those defines in, along with the name of the defines. --> - +#define CATEGORY_BITRUNNING_COMBAT_GEAR +#define CATEGORY_BITRUNNING_ABILITIES ### Included files that are not contained in this module: - N/A -<!-- Likewise, be it a non-modular file or a modular one that's not contained within the folder belonging to this specific module, it should be mentioned here. Good examples are icons or sounds that are used between multiple modules, or other such edge-cases. --> ### Credits: -<!-- Here go the credits to you, dear coder, and in case of collaborative work or ports, credits to the original source of the code. --> +Gboster-0 - Splitting the tech disks into their individual parts, Most of the disk icons From 743db15d1aff7ab5b04253b03b2f4323aeb71876 Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Sat, 7 Oct 2023 18:00:47 +0200 Subject: [PATCH 3/5] dammit TG, why are you like this --- .../modules/bitrunners/code/ability_disks.dm | 33 ++++++---------- .../bitrunners/code/combat_gear_disks.dm | 39 +++++++------------ 2 files changed, 26 insertions(+), 46 deletions(-) diff --git a/monkestation/code/modules/bitrunners/code/ability_disks.dm b/monkestation/code/modules/bitrunners/code/ability_disks.dm index 33ab39e884a6..08cd31f52fb6 100644 --- a/monkestation/code/modules/bitrunners/code/ability_disks.dm +++ b/monkestation/code/modules/bitrunners/code/ability_disks.dm @@ -16,13 +16,8 @@ * Tier 1 abilities */ -/datum/orderable_item/bitrunning_abilities/tier1 +/datum/orderable_item/bitrunning_abilities/conjure_cheese cost_per_order = 1000 - item_path = /obj/item/bitrunning_disk/ability/tier1 - - - -/datum/orderable_item/bitrunning_abilities/tier1/conjure_cheese item_path = /obj/item/bitrunning_disk/ability/monkestation_override/conjure_cheese /obj/item/bitrunning_disk/ability/monkestation_override/conjure_cheese @@ -32,7 +27,8 @@ -/datum/orderable_item/bitrunning_abilities/tier1/basic_heal +/datum/orderable_item/bitrunning_abilities/basic_heal + cost_per_order = 1000 item_path = /obj/item/bitrunning_disk/ability/monkestation_override/basic_heal /obj/item/bitrunning_disk/ability/monkestation_override/basic_heal @@ -44,13 +40,8 @@ * Tier 2 abilities */ -/datum/orderable_item/bitrunning_abilities/tier2 +/datum/orderable_item/bitrunning_abilities/fireball cost_per_order = 1500 - item_path = /obj/item/bitrunning_disk/item/tier2 - - - -/datum/orderable_item/bitrunning_abilities/tier2/fireball item_path = /obj/item/bitrunning_disk/ability/monkestation_override/fireball /obj/item/bitrunning_disk/ability/monkestation_override/fireball @@ -60,7 +51,8 @@ -/datum/orderable_item/bitrunning_abilities/tier2/lightningbolt +/datum/orderable_item/bitrunning_abilities/lightningbolt + cost_per_order = 1500 item_path = /obj/item/bitrunning_disk/ability/monkestation_override/lightningbolt /obj/item/bitrunning_disk/ability/monkestation_override/lightningbolt @@ -70,7 +62,8 @@ -/datum/orderable_item/bitrunning_abilities/tier2/forcewall +/datum/orderable_item/bitrunning_abilities/forcewall + cost_per_order = 1500 item_path = /obj/item/bitrunning_disk/ability/monkestation_override/forcewall /obj/item/bitrunning_disk/ability/monkestation_override/forcewall @@ -84,13 +77,8 @@ * Tier 3 abilities */ -/datum/orderable_item/bitrunning_abilities/tier3 +/datum/orderable_item/bitrunning_abilities/dragon cost_per_order = 2500 - item_path = /obj/item/bitrunning_disk/item/tier3 - - - -/datum/orderable_item/bitrunning_abilities/tier3/dragon item_path = /obj/item/bitrunning_disk/ability/monkestation_override/dragon /obj/item/bitrunning_disk/ability/monkestation_override/dragon @@ -100,7 +88,8 @@ -/datum/orderable_item/bitrunning_abilities/tier3/polar_bear +/datum/orderable_item/bitrunning_abilities/polar_bear + cost_per_order = 2500 item_path = /obj/item/bitrunning_disk/ability/monkestation_override/polar_bear /obj/item/bitrunning_disk/ability/monkestation_override/polar_bear diff --git a/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm b/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm index aad46309e740..58e78d8bf326 100644 --- a/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm +++ b/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm @@ -17,13 +17,8 @@ * Tier 1 combat gear */ -/datum/orderable_item/bitrunning_combat_gear/tier1 +/datum/orderable_item/bitrunning_combat_gear/pizza cost_per_order = 1000 - item_path = /obj/item/bitrunning_disk/item/tier1 - - - -/datum/orderable_item/bitrunning_combat_gear/tier1/pizza item_path = /obj/item/bitrunning_disk/item/monkestation_override/pizza /obj/item/bitrunning_disk/item/monkestation_override/pizza @@ -33,7 +28,8 @@ -/datum/orderable_item/bitrunning_combat_gear/tier1/medbeam +/datum/orderable_item/bitrunning_combat_gear/medbeam + cost_per_order = 1000 item_path = /obj/item/bitrunning_disk/item/monkestation_override/medbeam /obj/item/bitrunning_disk/item/monkestation_override/medbeam @@ -43,7 +39,8 @@ -/datum/orderable_item/bitrunning_combat_gear/tier1/c4 +/datum/orderable_item/bitrunning_combat_gear/c4 + cost_per_order = 1000 item_path = /obj/item/bitrunning_disk/item/monkestation_override/c4 /obj/item/bitrunning_disk/item/monkestation_override/c4 @@ -55,13 +52,8 @@ * Tier 2 combat gear */ -/datum/orderable_item/bitrunning_combat_gear/tier2 +/datum/orderable_item/bitrunning_combat_gear/chainsaw cost_per_order = 1800 - item_path = /obj/item/bitrunning_disk/item/tier2 - - - -/datum/orderable_item/bitrunning_combat_gear/tier2/chainsaw item_path = /obj/item/bitrunning_disk/item/monkestation_override/chainsaw /obj/item/bitrunning_disk/item/monkestation_override/chainsaw @@ -71,7 +63,8 @@ -/datum/orderable_item/bitrunning_combat_gear/tier2/pistol +/datum/orderable_item/bitrunning_combat_gear/pistol + cost_per_order = 1800 item_path = /obj/item/bitrunning_disk/item/monkestation_override/pistol /obj/item/bitrunning_disk/item/monkestation_override/pistol @@ -81,7 +74,8 @@ -/datum/orderable_item/bitrunning_combat_gear/tier2/hardlight_blade +/datum/orderable_item/bitrunning_combat_gear/hardlight_blade + cost_per_order = 1800 item_path = /obj/item/bitrunning_disk/item/monkestation_override/hardlight_blade /obj/item/bitrunning_disk/item/monkestation_override/hardlight_blade @@ -93,13 +87,8 @@ * Tier 3 combat gear */ -/datum/orderable_item/bitrunning_combat_gear/tier3 +/datum/orderable_item/bitrunning_combat_gear/tesla_cannon cost_per_order = 3200 - item_path = /obj/item/bitrunning_disk/item/tier3 - - - -/datum/orderable_item/bitrunning_combat_gear/tier3/tesla_cannon item_path = /obj/item/bitrunning_disk/item/monkestation_override/tesla_cannon /obj/item/bitrunning_disk/item/monkestation_override/tesla_cannon @@ -109,7 +98,8 @@ -/datum/orderable_item/bitrunning_combat_gear/tier3/dualsaber +/datum/orderable_item/bitrunning_combat_gear/dualsaber + cost_per_order = 3200 item_path = /obj/item/bitrunning_disk/item/monkestation_override/dualsaber /obj/item/bitrunning_disk/item/monkestation_override/dualsaber @@ -119,7 +109,8 @@ -/datum/orderable_item/bitrunning_combat_gear/tier3/beesword +/datum/orderable_item/bitrunning_combat_gear/beesword + cost_per_order = 3200 item_path = /obj/item/bitrunning_disk/item/monkestation_override/beesword /obj/item/bitrunning_disk/item/monkestation_override/beesword From 060412c77b985f7116c49273ac5ef63295fb438c Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Sat, 7 Oct 2023 18:07:40 +0200 Subject: [PATCH 4/5] blegh, that code is out of order --- code/modules/bitrunning/objects/disks.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/bitrunning/objects/disks.dm b/code/modules/bitrunning/objects/disks.dm index 30ac973749e4..66422b5386ab 100644 --- a/code/modules/bitrunning/objects/disks.dm +++ b/code/modules/bitrunning/objects/disks.dm @@ -28,11 +28,11 @@ examine_text += span_infoplain("This disk must be carried on your person into a netpod to be used.") - if(isnull(choice_made)) - examine_text += span_notice("To make a selection, toggle the disk in hand.") + if(monkeystation_override) // monkeystation change, override for disks with single powers/items return - if(monkeystation_override) // monkeystation change, override for disks with single powers/items + if(isnull(choice_made)) + examine_text += span_notice("To make a selection, toggle the disk in hand.") return examine_text += span_info("It has been used to select: <b>[choice_made]</b>.") From ce93ac25034d120d1f552d3c73fdb924df94972a Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Sat, 7 Oct 2023 18:37:03 +0200 Subject: [PATCH 5/5] boop --- monkestation/code/modules/bitrunners/readme.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/monkestation/code/modules/bitrunners/readme.md b/monkestation/code/modules/bitrunners/readme.md index e943f8723dd9..f56bf5faa0f7 100644 --- a/monkestation/code/modules/bitrunners/readme.md +++ b/monkestation/code/modules/bitrunners/readme.md @@ -3,16 +3,16 @@ https://github.com/Monkestation/Monkestation2.0/pull/429 ## \<Tha bitrunner PR: Splits the Technology disk tab into combat gear and abilities tabs, seperates all the disk choices into seperate disks> -BIT_RUNNERS ID: +- Module ID: ID: BIT_RUNNERS ### Description: -This modular file is for all things related to bitrunners, the PR that it started with is the title +- This modular file is for all things related to bitrunners, the PR that it started with is the title ### TG Proc/File Changes: <!-- Added an override for initialize, so we can get custom icons and remove un-needed descriptions. Along with changing the order categories --> --code/modules/bitrunning/objects/bit_vendor.dm +- code/modules/bitrunning/objects/bit_vendor.dm ### Modular Overrides: @@ -22,12 +22,12 @@ This modular file is for all things related to bitrunners, the PR that it starte <!-- Added defines so the order vendor functions properly --> - computers.dm -#define CATEGORY_BITRUNNING_COMBAT_GEAR -#define CATEGORY_BITRUNNING_ABILITIES +- #define CATEGORY_BITRUNNING_COMBAT_GEAR +- #define CATEGORY_BITRUNNING_ABILITIES ### Included files that are not contained in this module: - N/A ### Credits: -Gboster-0 - Splitting the tech disks into their individual parts, Most of the disk icons +- Gboster-0 - Splitting the tech disks into their individual parts, Most of the disk icons