Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

A few cargo price changes and balancing. #550

Merged
merged 2 commits into from
Dec 7, 2023
Merged

A few cargo price changes and balancing. #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2895dc1
some cargo changes
KittyNoodle Nov 13, 2023
d492567
whoops
KittyNoodle Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/atmospherics/gasmixtures/gas_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions monkestation/code/game/objects/items/recursive_gift.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok this is pretty funny.(and im sure will lead to no bugs)


return gift_type
2 changes: 1 addition & 1 deletion monkestation/code/modules/cargo/crates/imports.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions monkestation/code/modules/cargo/crates/service.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading