From b5049a960588c60e585ce0ffb2e6319852c2e390 Mon Sep 17 00:00:00 2001 From: _0Steven Date: Tue, 17 Dec 2024 03:07:32 +0100 Subject: [PATCH 1/3] implement the horse code --- .../code/items/special_snacks.dm | 62 +++++++++++++++ .../bitrunning_extras/code/orders/flair.dm | 15 ++++ .../code/supply_packs/starter_kit.dm | 78 +++++++++++++++++++ modular_doppler/bitrunning_extras/readme.md | 43 ++++++++++ tgstation.dme | 3 + 5 files changed, 201 insertions(+) create mode 100644 modular_doppler/bitrunning_extras/code/items/special_snacks.dm create mode 100644 modular_doppler/bitrunning_extras/code/orders/flair.dm create mode 100644 modular_doppler/bitrunning_extras/code/supply_packs/starter_kit.dm create mode 100644 modular_doppler/bitrunning_extras/readme.md diff --git a/modular_doppler/bitrunning_extras/code/items/special_snacks.dm b/modular_doppler/bitrunning_extras/code/items/special_snacks.dm new file mode 100644 index 0000000000000..00c9c13b37651 --- /dev/null +++ b/modular_doppler/bitrunning_extras/code/items/special_snacks.dm @@ -0,0 +1,62 @@ + +/obj/item/reagent_containers/hypospray/medipen/methamphetamine/gamer + name = "gamer energy medipen" + desc = "Contains everything needed to empower your gamer instincts and keep your fuel reserves topped up for a full session." + + +/obj/item/food/croissant/gamer + desc = "A delicious, buttery croissant. The ultimate sandwich." + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/medicine/omnizine = 6, /datum/reagent/love = 2) + tastes = list("fluffy bread" = 1, "butter" = 1, "bits and bytes" = 2) + +/obj/item/reagent_containers/cup/glass/mug/pepper_night_tea + name = "pepper night tea" + desc = "Perfect to shortly keep you warm on a cold winter night." + icon_state = "tea" + list_reagents = list(/datum/reagent/consumable/tea = 30, /datum/reagent/love = 5) + +/obj/item/storage/box/papersack/gamer_lunch + name = "gamer lunch bag" + desc = "It smells like home." + +/obj/item/storage/box/papersack/gamer_lunch/PopulateContents() + new /obj/item/food/croissant/gamer(src) + new /obj/item/food/croissant/gamer(src) + new /obj/item/food/croissant/gamer(src) + new /obj/item/reagent_containers/cup/glass/mug/pepper_night_tea(src) + new /obj/item/reagent_containers/cup/glass/mug/pepper_night_tea(src) + new /obj/item/reagent_containers/condiment/hotsauce(src) + + +/obj/item/reagent_containers/pill/gamer_pill/red + name = "red pill" + desc = "An oval-shaped maroon pill; it feels smooth to the touch." + list_reagents = list( + /datum/reagent/medicine/mannitol = 5, + /datum/reagent/medicine/neurine = 2, + /datum/reagent/inverse/lentslurri = 2, // oof ouch stomach cramps + ) + icon_state = "pill4" + +/obj/item/reagent_containers/pill/gamer_pill/blue + name = "blue pill" + desc = "An oval-shaped blue pill; it has a little ridge in the middle on one side." + list_reagents = list(/datum/reagent/medicine/psicodine = 10, /datum/reagent/drug/happiness = 5) + icon_state = "pill3" + +/obj/item/storage/pill_bottle/transgender_allegory + name = "bottle of gamer pills" + desc = "A bottle of pills issued by the Port Authority to ensure a bitrunner's mind stays sharp. \ + Despite the strange side effects many bitrunners thank these pills for having done wonders \ + for their mental health and body confidence." + special_desc = "Side effects of long-term use may include: cessation/reversal of male-pattern scalp hair loss, \ + softening of skin/decreased oiliness and acne, redistribution of body fat in a feminine pattern, \ + decreased muscle mass/strength, thinning/slowed growth of facial/body hair, \ + breast development and nipple/areolar enlargement, and changes in mood, emotionality, and behavior." + +/obj/item/storage/pill_bottle/transgender_allegory/PopulateContents() + // Three red pills, two blue pills + for(var/i in 1 to 2) + new /obj/item/reagent_containers/pill/gamer_pill/red(src) + new /obj/item/reagent_containers/pill/gamer_pill/blue(src) + new /obj/item/reagent_containers/pill/gamer_pill/red(src) diff --git a/modular_doppler/bitrunning_extras/code/orders/flair.dm b/modular_doppler/bitrunning_extras/code/orders/flair.dm new file mode 100644 index 0000000000000..55538669aa2c3 --- /dev/null +++ b/modular_doppler/bitrunning_extras/code/orders/flair.dm @@ -0,0 +1,15 @@ + +/datum/orderable_item/bitrunning_flair/gamer_lunch + purchase_path = /obj/item/storage/box/papersack/gamer_lunch + desc = "A minor reminder to keep yourself fed and hydrated." + cost_per_order = 750 + +/datum/orderable_item/bitrunning_flair/gamer_medipen + purchase_path = /obj/item/reagent_containers/hypospray/medipen/methamphetamine/gamer + desc = "Empower your gamer instincts and keep your fuel levels topped up!" + cost_per_order = 1000 + +/datum/orderable_item/bitrunning_flair/transgender_allegory + cost_per_order = 2000 + purchase_path = /obj/item/storage/pill_bottle/transgender_allegory + desc = "Keep your mind sharp and ready for action!" diff --git a/modular_doppler/bitrunning_extras/code/supply_packs/starter_kit.dm b/modular_doppler/bitrunning_extras/code/supply_packs/starter_kit.dm new file mode 100644 index 0000000000000..3ac6294f5cf3f --- /dev/null +++ b/modular_doppler/bitrunning_extras/code/supply_packs/starter_kit.dm @@ -0,0 +1,78 @@ + +/datum/supply_pack/service/bitrunnerkit + name = "Bitrunner Starter Kit" + desc = "Need a break from all that laborious cargo work? An assistant that needs more stimulation in their life? \ + Either way, this kit is all you'll ever need to allow your regular station crewman to seek some temporary reprieve from the ever-present troubles of station life. \ + Contains a personalizer avatar disk, a bitrunner suit, a six-pack of gamer drinks, much-needed snacks, \ + a gamerscore folder, and a towel to unceremoniously wipe off the netpod gunk." + cost = CARGO_CRATE_VALUE * 4 + access = ACCESS_BIT_DEN + access_view = ACCESS_BIT_DEN + contains = list( + /obj/item/bitrunning_disk/preferences, + /obj/item/storage/cans/sixgamerdrink, + /obj/item/folder/gamer, + /obj/item/towel, + ) + crate_name = "bitrunner starter kit" + crate_type = /obj/structure/closet/crate/secure/cargo + + /// Amount of snack items we roll to add + var/snack_count = 6 + /// Pool of snack items we may add from + var/list/snack_options = list( + /obj/item/food/cornchips, + /obj/item/food/cornchips/green, + /obj/item/food/cornchips/red, + /obj/item/food/cornchips/purple, + /obj/item/food/cornchips/blue, + /obj/item/food/cornchips/random, + ) + /// Pool of special items we may add from + var/list/special_options = list( + /obj/item/storage/pill_bottle/transgender_allegory, + /obj/item/storage/box/papersack/gamer_lunch, + /obj/item/reagent_containers/hypospray/medipen/methamphetamine/gamer, + ) + +/datum/supply_pack/service/bitrunnerkit/fill(obj/structure/closet/crate/our_crate) + . = ..() + for(var/i in 1 to snack_count) + var/obj/item/chosen_snack = pick(snack_options) + new chosen_snack(our_crate) + + if(prob(5)) + new /obj/item/clothing/glasses/sunglasses(our_crate) + new /obj/item/clothing/gloves/color/black(our_crate) + new /obj/item/clothing/shoes/laceup(our_crate) + new /obj/item/clothing/under/suit/black_really(our_crate) + else + new /obj/item/clothing/under/rank/cargo/bitrunner(our_crate) + + if(prob(20)) + var/obj/item/special_snack = pick(special_options) + new special_snack(our_crate) + + +/obj/item/storage/cans/sixgamerdrink + name = "gamer drink bottle ring" + desc = "Holds six gamer drink cans. Remember to recycle when you're done!" + + /// Pool of gamer drinks tm we may add from + var/list/gamer_drink_options = list( + /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 25, + /obj/item/reagent_containers/cup/soda_cans/volt_energy = 25, + /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 25, + /obj/item/reagent_containers/cup/soda_cans/pwr_game = 20, + /obj/item/reagent_containers/cup/soda_cans/thirteenloko = 5, + ) + +/obj/item/storage/cans/sixgamerdrink/PopulateContents() + for(var/i in 1 to 6) + var/obj/item/chosen_gamer_drink = pick_weight(gamer_drink_options) + new chosen_gamer_drink(src) + + +/obj/item/folder/gamer + name = "folder - 'domain certificates'" + desc = "A folder to keep track of all your gamer highscores." diff --git a/modular_doppler/bitrunning_extras/readme.md b/modular_doppler/bitrunning_extras/readme.md new file mode 100644 index 0000000000000..db64711117035 --- /dev/null +++ b/modular_doppler/bitrunning_extras/readme.md @@ -0,0 +1,43 @@ + + +## Bitrunning Extras + +Module ID: BITRUNNING_EXTRAS + +### Description: + +Minor additions for bitrunners, collected in one place. +For all your bitrunner gimmick needs. + + + +### TG Proc/File Changes: + +- N/A + + +### Modular Overrides: + +- N/A + + +### Defines: + +- N/A + + +### Included files that are not contained in this module: + +- N/A + + +### Credits: 00-Steven + + \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index f26f5366db77f..17281f9d55336 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6581,6 +6581,9 @@ #include "modular_doppler\autotransfer\autotransfer_config.dm" #include "modular_doppler\autotransfer\shuttle.dm" #include "modular_doppler\autotransfer\transfer_vote.dm" +#include "modular_doppler\bitrunning_extras\code\items\special_snacks.dm" +#include "modular_doppler\bitrunning_extras\code\orders\flair.dm" +#include "modular_doppler\bitrunning_extras\code\supply_packs\starter_kit.dm" #include "modular_doppler\bitrunning_prefs_disks\code\disks\prefs_disk.dm" #include "modular_doppler\bitrunning_prefs_disks\code\outfit_overrides\bitrunner_outfit_override.dm" #include "modular_doppler\cell_component\code\cell_component.dm" From 8e35f35d579c8e8a377e7653c45be70a053ec638 Mon Sep 17 00:00:00 2001 From: _0Steven Date: Tue, 17 Dec 2024 03:14:10 +0100 Subject: [PATCH 2/3] add wheelys to the horse --- .../bitrunning_extras/code/orders/flair.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modular_doppler/bitrunning_extras/code/orders/flair.dm b/modular_doppler/bitrunning_extras/code/orders/flair.dm index 55538669aa2c3..98b3f521ff775 100644 --- a/modular_doppler/bitrunning_extras/code/orders/flair.dm +++ b/modular_doppler/bitrunning_extras/code/orders/flair.dm @@ -10,6 +10,15 @@ cost_per_order = 1000 /datum/orderable_item/bitrunning_flair/transgender_allegory - cost_per_order = 2000 purchase_path = /obj/item/storage/pill_bottle/transgender_allegory desc = "Keep your mind sharp and ready for action!" + cost_per_order = 2000 + + +/datum/orderable_item/bitrunning_flair/wheelys + purchase_path = /obj/item/clothing/shoes/wheelys + cost_per_order = 1000 + +/datum/orderable_item/bitrunning_flair/toy_katana + purchase_path = /obj/item/toy/katana + cost_per_order = 1000 From 9a2243d7e49fb23a93fe59d84270694596e3d307 Mon Sep 17 00:00:00 2001 From: _0Steven Date: Thu, 19 Dec 2024 23:29:04 +0100 Subject: [PATCH 3/3] fix juni's linter issue --- tgstation.dme | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tgstation.dme b/tgstation.dme index 1aec00664119c..a6afd4c77ac23 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6582,14 +6582,14 @@ #include "modular_doppler\autotransfer\autotransfer_config.dm" #include "modular_doppler\autotransfer\shuttle.dm" #include "modular_doppler\autotransfer\transfer_vote.dm" -#include "modular_doppler\bitrunning_extras\code\items\special_snacks.dm" -#include "modular_doppler\bitrunning_extras\code\orders\flair.dm" -#include "modular_doppler\bitrunning_extras\code\supply_packs\starter_kit.dm" #include "modular_doppler\big_borg_lmao\code\robot.dm" #include "modular_doppler\big_borg_lmao\code\robot_defines.dm" #include "modular_doppler\big_borg_lmao\code\robot_model.dm" #include "modular_doppler\big_borg_lmao\code\robot_other.dm" #include "modular_doppler\big_borg_lmao\code\update_icons.dm" +#include "modular_doppler\bitrunning_extras\code\items\special_snacks.dm" +#include "modular_doppler\bitrunning_extras\code\orders\flair.dm" +#include "modular_doppler\bitrunning_extras\code\supply_packs\starter_kit.dm" #include "modular_doppler\bitrunning_prefs_disks\code\disks\prefs_disk.dm" #include "modular_doppler\bitrunning_prefs_disks\code\outfit_overrides\bitrunner_outfit_override.dm" #include "modular_doppler\cell_component\code\cell_component.dm"