From 1ad7540d41336c7aab560d9619ecd7aae0283cef Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Mon, 12 Aug 2024 19:20:01 +0300 Subject: [PATCH] [MIRROR] Uh oh! The NT board of workplace safety is trying to blacklist the Akhter Co. Prybar! (#4909) * Uh oh! The NT board of workplace safety is trying to blacklist the Akhter Co. Prybar! (#3635) * initial * forgot * review * edit * review perhaps * [MIRROR] Uh oh! The NT board of workplace safety is trying to blacklist the Akhter Co. Prybar! * Resolve conflict --------- Co-authored-by: lila Co-authored-by: StealsThePRs Co-authored-by: Feenie --- .../code/modules/cargo/markets/market_items/tool.dm | 9 +++++++++ .../code/armament_datums/akh_frontier.dm | 10 +--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modular_nova/master_files/code/modules/cargo/markets/market_items/tool.dm b/modular_nova/master_files/code/modules/cargo/markets/market_items/tool.dm index c9ff9946b85..35c5e90242d 100644 --- a/modular_nova/master_files/code/modules/cargo/markets/market_items/tool.dm +++ b/modular_nova/master_files/code/modules/cargo/markets/market_items/tool.dm @@ -6,3 +6,12 @@ price_max = CARGO_CRATE_VALUE * 1.5 stock_max = 2 availability_prob = 65 + +/datum/market_item/tool/doorforcer + name = "Akhter Company Prybar" + desc = "The infamous colonial crowbar, despite attempts at blacklisting by the Nanotrasen board of safety, still humbly available on the black market. " + item = /obj/item/crowbar/large/doorforcer + stock = 4 + price_min = CARGO_CRATE_VALUE * 0.5 + price_max = CARGO_CRATE_VALUE + availability_prob = 100 diff --git a/modular_nova/modules/company_imports/code/armament_datums/akh_frontier.dm b/modular_nova/modules/company_imports/code/armament_datums/akh_frontier.dm index 1c339e63654..398166e7963 100644 --- a/modular_nova/modules/company_imports/code/armament_datums/akh_frontier.dm +++ b/modular_nova/modules/company_imports/code/armament_datums/akh_frontier.dm @@ -11,14 +11,6 @@ /datum/armament_entry/company_import/akh_frontier/basic/omni_drill item_type = /obj/item/screwdriver/omni_drill -// FLUFFY FRONTIER REMOVAL BEGIN - No public door openers -/* -/datum/armament_entry/company_import/akh_frontier/basic/prybar - item_type = /obj/item/crowbar/large/doorforcer - restricted = TRUE -*/ -// FLUFFY FRONTIER REMOVAL END - /datum/armament_entry/company_import/akh_frontier/basic/arc_welder item_type = /obj/item/weldingtool/electric/arc_welder @@ -32,7 +24,7 @@ /datum/armament_entry/company_import/akh_frontier/deployables_fab/rapid_construction_fabricator item_type = /obj/item/flatpacked_machine - cost = CARGO_CRATE_VALUE * 6 + cost = CARGO_CRATE_VALUE * 8 restricted = TRUE /datum/armament_entry/company_import/akh_frontier/deployables_fab/foodricator