From 2895dc14a9d01d486944a7fda3606ec09510e72d Mon Sep 17 00:00:00 2001 From: KittyNoodle Date: Mon, 13 Nov 2023 16:14:11 -0600 Subject: [PATCH 1/2] some cargo changes --- code/modules/atmospherics/gasmixtures/gas_types.dm | 2 +- monkestation/code/game/objects/items/recursivegift.dm | 8 ++++++++ monkestation/code/modules/cargo/crates/imports.dm | 2 +- monkestation/code/modules/cargo/crates/service.dm | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 monkestation/code/game/objects/items/recursivegift.dm diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index ff22c6e103b6..9ac1fb08070f 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -206,7 +206,7 @@ moles_visible = MOLES_GAS_VISIBLE *30 fusion_power = -5 rarity = 10 - base_value = 5 + base_value = 1.5 //MONKESTATION EDIT 5 ==> 1.5 desc = "A coolant gas. Mainly used for it's endothermic reaction with oxygen." /datum/gas/hydrogen diff --git a/monkestation/code/game/objects/items/recursivegift.dm b/monkestation/code/game/objects/items/recursivegift.dm new file mode 100644 index 000000000000..1f0535485d61 --- /dev/null +++ b/monkestation/code/game/objects/items/recursivegift.dm @@ -0,0 +1,8 @@ +/obj/item/a_gift/recursive + name = "christmas gift" + desc = "It could be anything?" + +/obj/item/a_gift/recursive/get_gift_type() + var/gift_type = /obj/item/a_gift/recursive + + return gift_type diff --git a/monkestation/code/modules/cargo/crates/imports.dm b/monkestation/code/modules/cargo/crates/imports.dm index 3ff490e2b347..6204604b05e7 100644 --- a/monkestation/code/modules/cargo/crates/imports.dm +++ b/monkestation/code/modules/cargo/crates/imports.dm @@ -18,7 +18,7 @@ /datum/supply_pack/imports/wt550 name = "WT-550 Autorifle Crate" desc = "A proper ballistic option for a proper ballistic officer." - cost = CARGO_CRATE_VALUE * 30 + cost = CARGO_CRATE_VALUE * 21 contains = list( /obj/item/gun/ballistic/automatic/wt550/no_mag = 2, /obj/item/ammo_box/magazine/wt550m9/wtrub = 4, diff --git a/monkestation/code/modules/cargo/crates/service.dm b/monkestation/code/modules/cargo/crates/service.dm index 362ec9bc289a..89b1fd5cba11 100644 --- a/monkestation/code/modules/cargo/crates/service.dm +++ b/monkestation/code/modules/cargo/crates/service.dm @@ -20,11 +20,11 @@ /datum/supply_pack/service/birthday name = "Birthday Bash Pack" desc = "This is for that corgi, isn't it..." - cost = CARGO_CRATE_VALUE * 15 + cost = CARGO_CRATE_VALUE * 5 contains = list(/obj/item/toy/balloon = 5, /obj/item/reagent_containers/spray/chemsprayer/party = 3, /obj/item/clothing/head/costume/party = 5, /obj/item/food/cake/birthday, /obj/item/plate/small = 5, - /obj/item/a_gift/anything) + /obj/item/a_gift/recursive) crate_name = "Birthday Crate" From d492567a663fde0e68a5d5a0dde3d6bc4dc71841 Mon Sep 17 00:00:00 2001 From: KittyNoodle Date: Mon, 13 Nov 2023 16:22:33 -0600 Subject: [PATCH 2/2] whoops --- .../game/objects/items/{recursivegift.dm => recursive_gift.dm} | 0 tgstation.dme | 1 + 2 files changed, 1 insertion(+) rename monkestation/code/game/objects/items/{recursivegift.dm => recursive_gift.dm} (100%) diff --git a/monkestation/code/game/objects/items/recursivegift.dm b/monkestation/code/game/objects/items/recursive_gift.dm similarity index 100% rename from monkestation/code/game/objects/items/recursivegift.dm rename to monkestation/code/game/objects/items/recursive_gift.dm diff --git a/tgstation.dme b/tgstation.dme index d3bc1729f965..2165dcf0a4c0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5523,6 +5523,7 @@ #include "monkestation\code\game\objects\items\miningweapons.dm" #include "monkestation\code\game\objects\items\mothlet_grenade.dm" #include "monkestation\code\game\objects\items\plushies.dm" +#include "monkestation\code\game\objects\items\recursive_gift.dm" #include "monkestation\code\game\objects\items\stickers.dm" #include "monkestation\code\game\objects\items\superglue.dm" #include "monkestation\code\game\objects\items\AI_modules\monke_lawsets.dm"