Merge pull request #429 from Gboster-0/bitrunners

Tha bitrunner PR: Splits the Technology disk tab into combat gear/abilities tabs, seperates all the disk choices into seperate disks

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

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))
@@ -25,6 +28,9 @@
 
 	examine_text += span_infoplain("This disk must be carried on your person into a netpod to be used.")
 
+	if(monkeystation_override) // monkeystation change, override for disks with single powers/items
+		return
+
 	if(isnull(choice_made))
 		examine_text += span_notice("To make a selection, toggle the disk in hand.")
 		return

code/modules/bitrunning/objects/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"
 

monkestation/code/modules/bitrunners/code/ability_disks.dm

@@ -0,0 +1,98 @@
+/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/conjure_cheese
+	cost_per_order = 1000
+	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/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
+	name = "bitrunning program: basic heal"
+	icon_state = "heal"
+	selectable_actions = /datum/action/cooldown/spell/basic_heal
+
+/**
+ * Tier 2 abilities
+ */
+
+/datum/orderable_item/bitrunning_abilities/fireball
+	cost_per_order = 1500
+	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/lightningbolt
+	cost_per_order = 1500
+	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/forcewall
+	cost_per_order = 1500
+	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/dragon
+	cost_per_order = 2500
+	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/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
+	name = "bitrunning program: shapeshift, polar bear"
+	icon_state = "bear"
+	selectable_actions = /datum/action/cooldown/spell/shapeshift/polar_bear

monkestation/code/modules/bitrunners/code/combat_gear_disks.dm

@@ -0,0 +1,119 @@
+/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/pizza
+	cost_per_order = 1000
+	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/medbeam
+	cost_per_order = 1000
+	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/c4
+	cost_per_order = 1000
+	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/chainsaw
+	cost_per_order = 1800
+	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/pistol
+	cost_per_order = 1800
+	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/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
+	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/tesla_cannon
+	cost_per_order = 3200
+	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/dualsaber
+	cost_per_order = 3200
+	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/beesword
+	cost_per_order = 3200
+	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

monkestation/code/modules/bitrunners/readme.md

@@ -0,0 +1,33 @@
+
+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>
+
+- 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
+
+### 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
+
+### Modular Overrides:
+
+- N/A
+
+### Defines:
+
+<!-- Added defines so the order vendor functions properly -->
+- computers.dm
+- #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

tgstation.dme

@@ -5685,6 +5685,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"