From aace7379893828e201e434696d9ea4cdaff33bf7 Mon Sep 17 00:00:00 2001 From: Jerry Wester Date: Wed, 19 Oct 2022 17:20:52 -0600 Subject: [PATCH 1/4] Revert "Grant Arachnid Abilities to Driders" --- code/__DEFINES/inventory.dm | 3 +-- .../sprite_accessories/legs_and_taurs.dm | 1 - .../human/innate_abilities/customization.dm | 15 +-------------- code/modules/mob/living/carbon/human/species.dm | 13 ------------- .../living/carbon/human/species_types/arachnid.dm | 4 ++++ 5 files changed, 6 insertions(+), 30 deletions(-) diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 344ccc1b9b..6c83a46514 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -103,12 +103,11 @@ #define STYLE_SNEK_TAURIC (1<<2) //taur-friendly suits #define STYLE_PAW_TAURIC (1<<3) #define STYLE_HOOF_TAURIC (1<<4) -#define STYLE_ALL_TAURIC (STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC|STYLE_ARACHNID_TAURIC) +#define STYLE_ALL_TAURIC (STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC) #define STYLE_NO_ANTHRO_ICON (1<<5) //When digis fit the default sprite fine and need no copypasted states. This is the case of skirts and winter coats, for example. #define USE_SNEK_CLIP_MASK (1<<6) #define USE_QUADRUPED_CLIP_MASK (1<<7) #define USE_TAUR_CLIP_MASK (USE_SNEK_CLIP_MASK|USE_QUADRUPED_CLIP_MASK) -#define STYLE_ARACHNID_TAURIC (1<<8) //digitigrade legs settings. #define NOT_DIGITIGRADE 0 diff --git a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm index 843082265e..11fde50a37 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm @@ -97,7 +97,6 @@ icon_state = "drider" color_src = MUTCOLORS extra = TRUE - taur_mode = STYLE_ARACHNID_TAURIC /datum/sprite_accessory/taur/eevee name = "Eevee" diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 59786c9200..621dc58650 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -116,7 +116,7 @@ if(new_snout) H.dna.features["mam_snouts"] = new_snout H.update_body() - + else if (select_alteration == "Wings") var/new_color = input(owner, "Choose your wing color:", "Race change","#"+H.dna.features["wings_color"]) as color|null if(new_color) @@ -167,10 +167,6 @@ H.dna.features["mam_tail"] = new_tail if(new_tail != "None") H.dna.features["taur"] = "None" - var/datum/action/innate/spin_web/SW = locate(/datum/action/innate/spin_web) in H.actions - var/datum/action/innate/spin_cocoon/SC = locate(/datum/action/innate/spin_cocoon) in H.actions - SC?.Remove(H) - SW?.Remove(H) H.update_body() else if (select_alteration == "Taur body") @@ -186,16 +182,7 @@ var/new_taur new_taur = input(owner, "Choose your character's tauric body:", "Tauric Alteration") as null|anything in snowflake_taur_list if(new_taur) - var/datum/action/innate/spin_web/SW = locate(/datum/action/innate/spin_web) in H.actions - var/datum/action/innate/spin_cocoon/SC = locate(/datum/action/innate/spin_cocoon) in H.actions - SC?.Remove(H) - SW?.Remove(H) H.dna.features["taur"] = new_taur - if(new_taur == "Drider") - SW = new - SC = new - SC.Grant(H) - SW.Grant(H) if(new_taur != "None") H.dna.features["mam_tail"] = "None" H.update_body() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 8855137c99..afceabf2a6 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -527,12 +527,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) H.physiology.footstep_type = FOOTSTEP_MOB_CLAW if(STYLE_SNEK_TAURIC) H.physiology.footstep_type = FOOTSTEP_MOB_CRAWL - if(STYLE_ARACHNID_TAURIC) - if(!istype(H.dna.species,/datum/species/arachnid)) - var/datum/action/innate/spin_web/SW = new - var/datum/action/innate/spin_cocoon/SC = new - SC.Grant(H) - SW.Grant(H) else H.physiology.footstep_type = null else @@ -608,13 +602,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if((TRAIT_ROBOTIC_ORGANISM in inherent_traits) && C.hud_used) C.hud_used.coolant_display.clear() - if(ishuman(C)) - var/mob/living/carbon/human/H = C - var/datum/action/innate/spin_web/SW = locate(/datum/action/innate/spin_web) in H.actions - var/datum/action/innate/spin_cocoon/SC = locate(/datum/action/innate/spin_cocoon) in H.actions - SC?.Remove(H) - SW?.Remove(H) - SEND_SIGNAL(C, COMSIG_SPECIES_LOSS, src) // shamelessly inspired by antag_datum.remove_blacklisted_quirks() diff --git a/code/modules/mob/living/carbon/human/species_types/arachnid.dm b/code/modules/mob/living/carbon/human/species_types/arachnid.dm index 5358f9fee5..7495e2500e 100644 --- a/code/modules/mob/living/carbon/human/species_types/arachnid.dm +++ b/code/modules/mob/living/carbon/human/species_types/arachnid.dm @@ -54,6 +54,10 @@ /datum/species/arachnid/on_species_loss(mob/living/carbon/human/H) . = ..() + var/datum/action/innate/spin_web/SW = locate(/datum/action/innate/spin_web) in H.actions + var/datum/action/innate/spin_cocoon/SC = locate(/datum/action/innate/spin_cocoon) in H.actions + SC?.Remove(H) + SW?.Remove(H) /datum/action/innate/spin_web name = "Spin Web" From 20ffbf1a1263aa72fa2b0a1951f52c77d8e46e9c Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Wed, 26 Oct 2022 14:02:11 -0500 Subject: [PATCH 2/4] backport --- code/game/objects/items/storage/belt.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index cc54de09a6..f4fa638f7f 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -290,6 +290,7 @@ /obj/item/stack/ore, /obj/item/reagent_containers/food/drinks, /obj/item/organ/regenerative_core, + /obj/item/hivelordstabilizer, /obj/item/wormhole_jaunter, /obj/item/storage/bag/plants, /obj/item/stack/marker_beacon From 4a8abd0843c2193fe967e6a8407bdfd63a88a834 Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Mon, 31 Oct 2022 00:01:44 -0500 Subject: [PATCH 3/4] Revert "no more free money (#15375)" This reverts commit cb1848d06c2d0e3ff37dbb8a097648af339400bf. --- .../file_system/programs/budgetordering.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index 83c1ae3f95..a269f88242 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -79,6 +79,7 @@ if(id_card?.registered_account) if((ACCESS_HEADS in id_card.access) || (ACCESS_QM in id_card.access)) requestonly = FALSE + buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department) can_approve_requests = TRUE else requestonly = TRUE @@ -235,7 +236,8 @@ return if(!self_paid && ishuman(usr) && !account) - account = SSeconomy.get_dep_account(ACCOUNT_CAR) + var/obj/item/card/id/id_card = card_slot?.GetID() + account = SSeconomy.get_dep_account(id_card?.registered_account?.account_job.paycheck_department) var/turf/T = get_turf(src) var/datum/supply_order/SO = new(pack, name, rank, ckey, reason, account) @@ -261,7 +263,9 @@ var/id = text2num(params["id"]) for(var/datum/supply_order/SO in SSshuttle.requestlist) if(SO.id == id) - SO.paying_account = SSeconomy.get_dep_account(ACCOUNT_CAR) + var/obj/item/card/id/id_card = card_slot?.GetID() + if(id_card && id_card?.registered_account) + SO.paying_account = SSeconomy.get_dep_account(id_card?.registered_account?.account_job.paycheck_department) SSshuttle.requestlist -= SO SSshuttle.shoppinglist += SO . = TRUE From bab984be30f96895ca6b2165f90fb4aeb8bb3a73 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Mon, 31 Oct 2022 11:50:54 -0500 Subject: [PATCH 4/4] i hate runtimestation i hate runtimestation --- code/game/machinery/civilian_bountys.dm | 2 +- code/modules/mining/machine_vending.dm | 45 +++++++++++++------------ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/code/game/machinery/civilian_bountys.dm b/code/game/machinery/civilian_bountys.dm index 0395956d8b..1df0d02c3b 100644 --- a/code/game/machinery/civilian_bountys.dm +++ b/code/game/machinery/civilian_bountys.dm @@ -21,11 +21,11 @@ pad = /obj/machinery/piratepad/civilian /obj/machinery/computer/piratepad_control/civilian/attackby(obj/item/I, mob/living/user, params) - . = ..() if(isidcard(I)) if(id_insert(user, I, inserted_scan_id)) inserted_scan_id = I return TRUE + . = ..() /obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I) if(istype(I) && istype(I.buffer,/obj/machinery/piratepad/civilian)) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index b36cef6938..bdb72de271 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -27,7 +27,7 @@ new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500), new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500), new /datum/data/mining_equipment("Larger Ore Bag", /obj/item/storage/bag/ore/large, 500), - new /datum/data/mining_equipment("500 Point Transfer Card", /obj/item/card/mining_point_card/mp500, 500), + new /datum/data/mining_equipment("Mining Point Transfer Card", /obj/item/card/mining_point_card, 500), new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600), new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750), new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/kinetic_crusher, 750), @@ -43,9 +43,6 @@ new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000), new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000), new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining/conscript, 1000), - new /datum/data/mining_equipment("1000 Point Transfer Card", /obj/item/card/mining_point_card/mp1000, 1000), - new /datum/data/mining_equipment("1500 Point Transfer Card", /obj/item/card/mining_point_card/mp1500, 1500), - new /datum/data/mining_equipment("2000 Point Transfer Card", /obj/item/card/mining_point_card/mp2000, 2000), new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000), new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), @@ -328,28 +325,31 @@ //TODO add in cr = Credits for cargo /obj/item/card/mining_point_card name = "mining points card" - desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard. This one only holds a small 50 points on it." + desc = "A small card for transferring mining points. Swipe your ID card over it to start the process." icon_state = "data_1" - var/points = 50 - -/obj/item/card/mining_point_card/mp500 - desc = "A small card preloaded with 500 mining points. Swipe your ID card over it to transfer the points, then discard." - points = 500 - -/obj/item/card/mining_point_card/mp1000 - desc = "A small card preloaded with 1000 mining points. Swipe your ID card over it to transfer the points, then discard." - points = 1000 - -/obj/item/card/mining_point_card/mp1500 - desc = "A small card preloaded with 1500 mining points. Swipe your ID card over it to transfer the points, then discard." - points = 1500 - -/obj/item/card/mining_point_card/mp2000 - desc = "A small card preloaded with 2000 mining points. Swipe your ID card over it to transfer the points, then discard." - points = 2000 + var/points = 500 /obj/item/card/mining_point_card/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/card/id)) + var/obj/item/card/id/id = I + to_chat(user, span_info("You swipe [id] on [src] and start the transfer process.")) + var/choice = alert(user, "Do you want to transfer points to or from the point card's storage?", "Mining Points Transfer", "From Point Card/Storage", "To Point Card/Storage", "Cancel") + if(choice != "Cancel") + var/amount = input(user, "How much do you want to transfer? ID Balance: [id.mining_points], Transfer Card Balance: [points]", "Transfer Points") as num|null + if(!amount || amount <= 0) + return + amount = round(amount, 1) + if(choice == "To Point Card/Storage") + if(amount && amount <= id.mining_points) + id.mining_points -= amount + points += amount + to_chat(user, span_info("You transfer [amount] points to [src] from [id].")) + else if(choice == "From Point Card/Storage") + if(amount && amount <= points) + id.mining_points += amount + points -= amount + to_chat(user, span_info("You transfer [amount] points to [id] from [src].")) + /* if(points) var/obj/item/card/id/C = I C.mining_points += points @@ -357,6 +357,7 @@ points = 0 else to_chat(user, "There's no points left on [src].") + */ ..() /obj/item/card/mining_point_card/examine(mob/user)