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.

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

Merge upstream 19.05.2024 #270

Merged
merged 160 commits into from
May 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
ba9cb64
Tgui: More common components in ts (#83098)
jlsnow301 May 11, 2024
b535d22
Automatic changelog compile [ci skip]
actions-user May 12, 2024
c3622c3
Enables right click, alt click, ctrl click for alt-click item window …
Metekillot May 12, 2024
67a8912
Automatic changelog for PR #83179 [ci skip]
comfyorange May 12, 2024
6606fa4
Bitrunner job figurine (#83173)
Rhials May 12, 2024
400ba8e
Automatic changelog for PR #83173 [ci skip]
comfyorange May 12, 2024
1b09d8d
Rat Kings can no longer create grime and miasma while ventcrawling (#…
PapaMichae1 May 12, 2024
de25d43
Automatic changelog for PR #83176 [ci skip]
comfyorange May 12, 2024
45b403f
Fix the RMB action on the cigarettes pack and add a new QoL (#83170)
paganiy May 12, 2024
f20a080
Automatic changelog for PR #83170 [ci skip]
comfyorange May 12, 2024
2083960
Adds a period to the end of the wendigo deathrattle (#83185)
nikothedude May 12, 2024
72c92f3
Automatic changelog for PR #83185 [ci skip]
comfyorange May 12, 2024
a838d0b
Replace cigarette smoke with particles, add a big puff when taking ci…
MrMelbert May 13, 2024
4524b70
Automatic changelog for PR #83101 [ci skip]
comfyorange May 13, 2024
951f24d
Automatic changelog compile [ci skip]
actions-user May 13, 2024
547ca8f
Node Bootstrap: Cast OS version to int so compat code works (#83190)
MrsTonedOne May 13, 2024
c12af14
Fixes sabre alt-click (#83162)
jlsnow301 May 13, 2024
30675c9
Automatic changelog for PR #83162 [ci skip]
comfyorange May 13, 2024
d70aa8b
Fix the size of the projectile of the accelerator laser cannon (#83144)
paganiy May 13, 2024
1e2df8b
Automatic changelog for PR #83144 [ci skip]
comfyorange May 13, 2024
bca5685
tgui: Strings.ts (#83096)
jlsnow301 May 13, 2024
28791c0
Bodybuilders can see each others' power levels. (#83088)
Jacquerel May 13, 2024
671c47f
Automatic changelog for PR #83088 [ci skip]
comfyorange May 13, 2024
013e40b
Fixes brain deletion not being lethal (#83203)
Time-Green May 13, 2024
6e794ef
Automatic changelog for PR #83203 [ci skip]
comfyorange May 13, 2024
6933307
Fixes tram malfuction event not ending properly (#83200)
ShizCalev May 13, 2024
5d81ba7
Makes Health Sensor assemblies a bit nicer to use (#83183)
May 13, 2024
8895e8d
Automatic changelog for PR #83183 [ci skip]
comfyorange May 13, 2024
2dc73fb
Automatic changelog compile [ci skip]
actions-user May 14, 2024
65fd769
Fixes arcade spawners in Interdyne Spinward Research Base (#83171)
DaCoolBoss May 14, 2024
8d81e19
Automatic changelog for PR #83171 [ci skip]
comfyorange May 14, 2024
e1ac6e4
Makes it so cargo security doesnt get stuck in mining station. (#83209)
KingkumaArt May 14, 2024
3e1889d
Automatic changelog for PR #83209 [ci skip]
comfyorange May 14, 2024
1184365
Allows status effects with alerts to display their duration (on the a…
MrMelbert May 14, 2024
6e1d6e7
Automatic changelog for PR #83211 [ci skip]
comfyorange May 14, 2024
db782b6
Fixes random decal in space on Tramstation (#83178)
iwishforducks May 14, 2024
348d69c
Automatic changelog for PR #83178 [ci skip]
comfyorange May 14, 2024
a8dda64
Moves as many db related date/time operations to the db side to avoid…
MrsTonedOne May 14, 2024
d7aef14
Fixes cultist blood rites runtime (#83220)
Lufferly May 15, 2024
55d77b5
Automatic changelog for PR #83220 [ci skip]
comfyorange May 15, 2024
40c2bca
Fixes a reversion to the greyscale plate armor (#83214)
necromanceranne May 15, 2024
268cf9a
Automatic changelog for PR #83214 [ci skip]
comfyorange May 15, 2024
16be085
Fixes energy lost as heat for some machines (#83205)
SyncIt21 May 15, 2024
ca92ca4
Fixes destroyed solar panels dropping overlays (#83224)
Lufferly May 15, 2024
bfa1582
Automatic changelog compile [ci skip]
actions-user May 15, 2024
2860887
Automatic changelog for PR #83205 [ci skip]
comfyorange May 15, 2024
b825ac4
Automatic changelog for PR #83224 [ci skip]
comfyorange May 15, 2024
9affd58
Fixes kinetic accelerator fire sound div 0 runtime (#83177)
ShizCalev May 15, 2024
8b8934c
Portals now make sounds (#83166)
Sadboysuss May 15, 2024
db33f07
[NO GBP] Fixes the knife offsets of pipeguns (#83155)
necromanceranne May 15, 2024
1d1a264
Confirm Order button now active when cargo shuttle is at Central (#83…
Shadow-Quill May 15, 2024
a35e1e4
Automatic changelog for PR #83166 [ci skip]
comfyorange May 15, 2024
1f7bb38
Automatic changelog for PR #83155 [ci skip]
comfyorange May 15, 2024
7e4886c
Automatic changelog for PR #83152 [ci skip]
comfyorange May 15, 2024
3f73d00
allows the SC/FISHER to shoot floor lights (#83182)
Hatterhat May 15, 2024
183bd6b
Fixes minor runtime when borgs get qdeleted (#83221)
ShizCalev May 15, 2024
a0a51c5
Ensures kinetic accelerators always get their mods added to the modki…
ShizCalev May 15, 2024
4a1cb19
Automatic changelog for PR #83182 [ci skip]
comfyorange May 15, 2024
7017305
Automatic changelog for PR #83222 [ci skip]
comfyorange May 15, 2024
fce5209
Fixes some bitrunning related issues [no gbp] (#83184)
jlsnow301 May 15, 2024
9748ccd
Automatic changelog for PR #83184 [ci skip]
comfyorange May 15, 2024
261548f
Staff of Shrinking for the wizard (#83115)
PKPenguin321 May 15, 2024
d942da7
Blood Brothers admin tooling (#83130)
Jacquerel May 15, 2024
ca8dcc2
Automatic changelog for PR #83115 [ci skip]
comfyorange May 15, 2024
df3d409
Automatic changelog for PR #83130 [ci skip]
comfyorange May 15, 2024
4b174e4
Adds a new neutral lawset, the Y.E.S.M.A.N. lawset, to the AI lawset …
Iamgoofball May 15, 2024
7499b84
Protects space spawned humans from radiation nebula (#83202)
Time-Green May 15, 2024
db6ce47
Adds -y to upgrade in the docker files to prevent breakage (#83198)
DaxDupont May 15, 2024
1ea3cfc
The Shovellening: Coroner and Miner Coats can now hold Shovels (#83139)
DrAmazing343 May 15, 2024
0ab70e4
Automatic changelog for PR #83202 [ci skip]
comfyorange May 15, 2024
f0e8ee6
Adds more box types to cardboard crafting (#83135)
Derpguy3 May 15, 2024
45dfe7d
Automatic changelog for PR #83198 [ci skip]
comfyorange May 15, 2024
6712682
Automatic changelog for PR #83139 [ci skip]
comfyorange May 15, 2024
25eae99
Automatic changelog for PR #83135 [ci skip]
comfyorange May 15, 2024
d06d92b
General maintenance for smoke machine (#83158)
SyncIt21 May 15, 2024
737f571
Blade creation ritual returns lost blades (#82592)
Xackii May 15, 2024
95b3cfa
Automatic changelog for PR #83158 [ci skip]
comfyorange May 15, 2024
066815a
The armoury contraband locker guns have a chance to be rigged. (#83167)
Pickle-Coding May 15, 2024
32ff8d1
Automatic changelog for PR #83167 [ci skip]
comfyorange May 15, 2024
e143e52
Moves the departmental delivery area check to a unit test so it stops…
Majkl-J May 15, 2024
1133e90
Shift-clicking an offer for an item will examine the item (#83180)
MrMelbert May 15, 2024
e12e3df
Automatic changelog for PR #83180 [ci skip]
comfyorange May 15, 2024
b5f6b04
parrots try to immitate voices (#82773)
Ben10Omintrix May 15, 2024
1946ba1
Automatic changelog for PR #82773 [ci skip]
comfyorange May 15, 2024
53518e0
Circuit editor QoL and new circuit components (#82969)
tmyqlfpir May 15, 2024
84472cb
[no gbp] Fixes uniform alt click while resting (#83231)
jlsnow301 May 15, 2024
ae64cae
Automatic changelog for PR #82969 [ci skip]
comfyorange May 15, 2024
b832885
Automatic changelog for PR #83231 [ci skip]
comfyorange May 15, 2024
428c594
Automatic changelog compile [ci skip]
actions-user May 16, 2024
926f819
Remove sleeper protocol objective + Remove the upper limit to sabotag…
Xander3359 May 16, 2024
150418d
Automatic changelog for PR #83206 [ci skip]
comfyorange May 16, 2024
2d5f448
Assorted minor alt-click reskinning fixes, primarily context-based (#…
00-Steven May 16, 2024
e55f24b
Automatic changelog for PR #83105 [ci skip]
comfyorange May 16, 2024
ec41cba
Fixes wings working in space (#83239)
Lufferly May 16, 2024
fb7e9fc
Automatic changelog for PR #83239 [ci skip]
comfyorange May 16, 2024
125d637
Fixes some atoms conduct electricity flag (#83230)
RengaN02 May 16, 2024
40ca497
Automatic changelog for PR #83230 [ci skip]
comfyorange May 16, 2024
1904409
Neckties can be worn below suits and accessories (#83131)
siliconOpossum May 16, 2024
a8fc20d
Automatic changelog for PR #83131 [ci skip]
comfyorange May 16, 2024
091e3af
Restores Balance to the Candle Economy (#83240)
Thunder12345 May 16, 2024
501c8c7
Automatic changelog for PR #83240 [ci skip]
comfyorange May 16, 2024
650492a
Fixes Spess Knife's cutter tool having an invisible sprite (#83246)
May 16, 2024
e364c3e
Automatic changelog for PR #83246 [ci skip]
comfyorange May 16, 2024
f70350c
Fixes simplebot ui [no gbp] (#83235)
jlsnow301 May 16, 2024
6f9f3cf
Automatic changelog for PR #83235 [ci skip]
comfyorange May 16, 2024
77e739a
Cargo goodies section typo fix (#83245)
May 16, 2024
959477c
Atoms that are on the border of a tile will now only trigger landmine…
ShizCalev May 16, 2024
e8b834c
Automatic changelog for PR #83245 [ci skip]
comfyorange May 16, 2024
c0e5e32
Automatic changelog for PR #83156 [ci skip]
comfyorange May 16, 2024
03db803
Parse_zone audit + minor misc cleanup (#83154)
nikothedude May 16, 2024
ffd227c
Automatic changelog for PR #83154 [ci skip]
comfyorange May 16, 2024
74f52a7
Fixes cyborg omnitool combat behaviour. (#83243)
Pickle-Coding May 16, 2024
5a3d67a
Automatic changelog for PR #83243 [ci skip]
comfyorange May 16, 2024
d93d19c
mobile defibrillator mount (#83000)
mc-oofert May 16, 2024
1faa23b
Automatic changelog for PR #83000 [ci skip]
comfyorange May 16, 2024
4264919
Fix radiation not causing mutations or making you bald (3 year old bu…
MrMelbert May 16, 2024
0e12079
Automatic changelog for PR #83251 [ci skip]
comfyorange May 16, 2024
1548372
Rust Heretic rework: THE PUKENING. (#83006)
EnterTheJake May 16, 2024
6e36398
Automatic changelog for PR #83006 [ci skip]
comfyorange May 16, 2024
5dc5ccd
Fixes missing scrubber pipes on metastation (#83232)
improvedname May 16, 2024
a051994
Automatic changelog for PR #83232 [ci skip]
comfyorange May 16, 2024
a3940a4
Updates to orbit ui [READY] (#83186)
jlsnow301 May 16, 2024
a50e2cd
Automatic changelog for PR #83186 [ci skip]
comfyorange May 16, 2024
f1a22b3
Changes how lube crawling works and fixes a bug with snails (#83238)
JohnFulpWillard May 16, 2024
10b2af4
Automatic changelog for PR #83238 [ci skip]
comfyorange May 16, 2024
2edb3af
Automatic changelog compile [ci skip]
actions-user May 17, 2024
761b14e
lavaland raptors (#82537)
Ben10Omintrix May 17, 2024
0e63413
Automatic changelog for PR #82537 [ci skip]
comfyorange May 17, 2024
c79cedc
Fixes Space Phase softlock (#83241)
Absolucy May 17, 2024
4c79bd5
Automatic changelog for PR #83241 [ci skip]
comfyorange May 17, 2024
74efdd3
Adds Minecarts (#83175)
MrMelbert May 17, 2024
ee0d5f3
Automatic changelog for PR #83175 [ci skip]
comfyorange May 17, 2024
225562b
Cancel CI on new commit (#83255)
jlsnow301 May 17, 2024
55f4249
fixes runtime when trying to remove a nonexistent source ID via Remov…
ShizCalev May 17, 2024
f70ea21
Fixes a bunch of hearts becoming errors when being eaten (#83259)
Echriser May 17, 2024
31c13fd
Automatic changelog for PR #83259 [ci skip]
comfyorange May 17, 2024
eb5ac96
Upgrades nukies ordnance by adding more gasses and better stock parts…
improvedname May 17, 2024
83d0154
Automatic changelog for PR #83233 [ci skip]
comfyorange May 17, 2024
f0f026d
Standardises name of The Lizard's Gas (Lava) (#83250)
DaCoolBoss May 17, 2024
868c85c
Fixes Malf AI not being able to override/overload turrets that have c…
ShizCalev May 17, 2024
df6939f
Automatic changelog for PR #83250 [ci skip]
comfyorange May 17, 2024
7684168
Automatic changelog for PR #83252 [ci skip]
comfyorange May 17, 2024
cd9e9dc
Tgui: Events & Colors in typescript (#83218)
jlsnow301 May 17, 2024
14e27ec
adds the Ansem/SC, the logical conclusion to the John Splintercell se…
Hatterhat May 17, 2024
0612a49
Automatic changelog for PR #83228 [ci skip]
comfyorange May 17, 2024
e81a94d
Malf AI overload blacklists (#83226)
Sadboysuss May 17, 2024
715d61f
Automatic changelog for PR #83226 [ci skip]
comfyorange May 17, 2024
d83bf4f
Suit sensors can now be quick-maxed by ctrl clicking (#83265)
Sadboysuss May 17, 2024
8ebef95
Automatic changelog for PR #83265 [ci skip]
comfyorange May 17, 2024
de11d2b
[Icebox] Retvrn: Brings Bar Back to Base (level) (#83163)
MrMelbert May 17, 2024
d6d8103
Automatic changelog for PR #83163 [ci skip]
comfyorange May 17, 2024
d37779e
Micro-optimizes _SendSignal a bit (#83244)
Watermelon914 May 17, 2024
0ae4675
Mobs spawners won't spawn more mobs than they are supposed to (#83266)
Jacquerel May 17, 2024
3291b81
Automatic changelog for PR #83266 [ci skip]
comfyorange May 17, 2024
2a31a79
Automatic changelog compile [ci skip]
actions-user May 18, 2024
357a14e
Resprites the Blade Heretic knives. (#83207)
EnterTheJake May 18, 2024
511b9fd
Removes a bunch of unused families huds (#82916)
Rex9001 May 18, 2024
2a29dd3
[no gbp] removes signpost from icebox (#83272)
Ben10Omintrix May 18, 2024
87dbd5c
Merge remote-tracking branch 'off/master' into merge-upstream
Gaxeer May 19, 2024
0d0c0cd
refactor: adjust to `string.js` refactor to `string.ts`
Gaxeer May 19, 2024
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
Prev Previous commit
Next Next commit
Cargo goodies section typo fix (tgstation#83245)
## About The Pull Request

Fixes some typos in the Cargo goodies section and makes the item names a
bit more consistent

## Why It's Good For The Game

typos bad

## Changelog

:cl:
spellcheck: Fixes some typos in the goodies section and makes it look a
bit more consistent.
/:cl:
starrm4nn authored May 16, 2024
commit 77e739af3542f98016cc188e48cad35474760238
56 changes: 28 additions & 28 deletions code/modules/cargo/goodies.dm
Original file line number Diff line number Diff line change
@@ -12,21 +12,21 @@
contains = list(/obj/item/modular_computer/pda/clear)

/datum/supply_pack/goody/dumdum38
name = ".38 DumDum Speedloader"
name = ".38 DumDum Speedloader Single-Pack"
desc = "Contains one speedloader of .38 DumDum ammunition, good for embedding in soft targets."
cost = PAYCHECK_CREW * 2
access_view = ACCESS_WEAPONS
contains = list(/obj/item/ammo_box/c38/dumdum)

/datum/supply_pack/goody/match38
name = ".38 Match Grade Speedloader"
name = ".38 Match Grade Speedloader Single-Pack"
desc = "Contains one speedloader of match grade .38 ammunition, perfect for showing off trickshots."
cost = PAYCHECK_CREW * 2
access_view = ACCESS_WEAPONS
contains = list(/obj/item/ammo_box/c38/match)

/datum/supply_pack/goody/rubber
name = ".38 Rubber Speedloader"
name = ".38 Rubber Speedloader Single-Pack"
desc = "Contains one speedloader of bouncy rubber .38 ammunition, for when you want to bounce your shots off anything and everything."
cost = PAYCHECK_CREW * 1.5
access_view = ACCESS_WEAPONS
@@ -41,14 +41,14 @@

/datum/supply_pack/goody/stingbang
name = "Stingbang Single-Pack"
desc = "Contains one \"stingbang\" grenade, perfect for playing meanhearted pranks."
desc = "Contains one \"Stingbang\" grenade, perfect for playing meanhearted pranks."
cost = PAYCHECK_COMMAND * 2.5
access_view = ACCESS_WEAPONS
contains = list(/obj/item/grenade/stingbang)

/datum/supply_pack/goody/Survivalknives_single
name = "Survival Knife Single-Pack"
desc = "Contains one sharpened survival knive. Guaranteed to fit snugly inside any Nanotrasen-standard boot."
desc = "Contains one sharpened survival knife. Guaranteed to fit snugly inside any Nanotrasen-standard boot."
cost = PAYCHECK_COMMAND * 1.75
contains = list(/obj/item/knife/combat/survival)

@@ -61,21 +61,21 @@

/datum/supply_pack/goody/disabler_single
name = "Disabler Single-Pack"
desc = "Contains one disabler, the nonlethal workhorse of Nanotrasen security everywehere. Comes in a energy holster, just in case you happen to have an extra disabler."
desc = "Contains one disabler, the non-lethal workhorse of Nanotrasen security everywhere. Comes in a energy holster, just in case you happen to have an extra disabler."
cost = PAYCHECK_COMMAND * 3
access_view = ACCESS_WEAPONS
contains = list(/obj/item/storage/belt/holster/energy/disabler)

/datum/supply_pack/goody/energy_single
name = "Energy Gun Single-Pack"
desc = "Contains one energy gun, capable of firing both nonlethal and lethal blasts of light."
desc = "Contains one energy gun, capable of firing both non-lethal and lethal blasts of light."
cost = PAYCHECK_COMMAND * 12
access_view = ACCESS_WEAPONS
contains = list(/obj/item/gun/energy/e_gun)

/datum/supply_pack/goody/laser_single
name = "Laser Gun Single-Pack"
desc = "Contains one laser gun, the lethal workhorse of Nanotrasen security everywehere."
desc = "Contains one laser gun, the lethal workhorse of Nanotrasen security everywhere."
cost = PAYCHECK_COMMAND * 6
access_view = ACCESS_WEAPONS
contains = list(/obj/item/gun/energy/laser)
@@ -161,7 +161,7 @@
contains = list(/obj/item/toy/plush/beeplushie)

/datum/supply_pack/goody/blahaj
name = "Shark plushie"
name = "Shark Plushie"
desc = "A soft, warm companion for midday naps."
cost = PAYCHECK_CREW * 5
contains = list(/obj/item/toy/plush/shark)
@@ -179,7 +179,7 @@
contains = list(/obj/item/dyespray)

/datum/supply_pack/goody/beach_ball
name = "Beach Ball"
name = "Beach Ball Single-Pack"
// uses desc from item
cost = PAYCHECK_CREW
contains = list(/obj/item/toy/beach_ball/branded)
@@ -208,19 +208,19 @@
contains = list(/obj/item/food/ready_donk)

/datum/supply_pack/goody/pill_mutadone
name = "Emergency Mutadone Pill"
name = "Emergency Mutadone Pill Single-Pack"
desc = "A single pill for curing genetic defects. Useful for when you can't procure one from medbay."
cost = PAYCHECK_CREW * 2.5
contains = list(/obj/item/reagent_containers/pill/mutadone)

/datum/supply_pack/goody/rapid_lighting_device
name = "Rapid Lighting Device (RLD)"
name = "Rapid Lighting Device (RLD) Single-Pack"
desc = "A device used to rapidly provide lighting sources to an area. Reload with iron, plasteel, glass or compressed matter cartridges."
cost = PAYCHECK_CREW * 10
contains = list(/obj/item/construction/rld)

/datum/supply_pack/goody/fishing_toolbox
name = "Fishing toolbox"
name = "Fishing Toolbox"
desc = "Complete toolbox set for your fishing adventure. Advanced hooks and lines sold separetely."
cost = PAYCHECK_CREW * 2
contains = list(/obj/item/storage/toolbox/fishing)
@@ -238,86 +238,86 @@
contains = list(/obj/item/storage/box/fishing_lines)

/datum/supply_pack/goody/fishing_hook_rescue
name = "Rescue Fishing Hook"
name = "Rescue Fishing Hook Single-Pack"
desc = "For when your fellow miner has inevitably fallen into a chasm, and it's up to you to save them."
cost = PAYCHECK_CREW * 12
contains = list(/obj/item/fishing_hook/rescue)

/datum/supply_pack/goody/premium_bait
name = "Deluxe fishing bait"
name = "Deluxe Fishing Bait Single-Pack"
desc = "When the standard variety is not good enough for you."
cost = PAYCHECK_CREW
contains = list(/obj/item/bait_can/worm/premium)

/datum/supply_pack/goody/fish_feed
name = "Can of fish food"
name = "Can of Fish Food Single-Pack"
desc = "For keeping your little friends fed and alive."
cost = PAYCHECK_CREW * 1
contains = list(/obj/item/fish_feed)

/datum/supply_pack/goody/naturalbait
name = "Freshness Jars full of Natural Bait"
name = "Freshness Jars full of Natural Bait Single-Pack"
desc = "Homemade in the Spinward Sector."
cost = PAYCHECK_CREW * 4 //rock on
contains = list(/obj/item/storage/pill_bottle/naturalbait)

/datum/supply_pack/goody/telescopic_fishing_rod
name = "Telescopic Fishing Rod"
name = "Telescopic Fishing Rod Single-Pack"
desc = "A collapsible fishing rod that can fit within a backpack."
cost = PAYCHECK_CREW * 8
contains = list(/obj/item/fishing_rod/telescopic)

/datum/supply_pack/goody/fish_analyzer
name = "Fish Analyzer"
name = "Fish Analyzer Single-Pack"
desc = "A single analyzer to monitor fish's status and traits with, in case you don't have the technology to print one."
cost = PAYCHECK_CREW * 2.5
contains = list(/obj/item/fish_analyzer)

/datum/supply_pack/goody/fish_catalog
name = "Fishing Catalog"
name = "Fishing Catalog Single-Pack"
desc = "A catalog containing all the fishy info you'll ever need."
cost = PAYCHECK_LOWER
contains = list(/obj/item/book/manual/fish_catalog)

/datum/supply_pack/goody/coffee_mug
name = "Coffee Mug"
name = "Coffee Mug Single-Pack"
desc = "A bog standard coffee mug, for drinking coffee."
cost = PAYCHECK_LOWER
contains = list(/obj/item/reagent_containers/cup/glass/mug)

/datum/supply_pack/goody/nt_mug
name = "Nanotrasen Coffee Mug"
name = "Nanotrasen Coffee Mug Single-Pack"
desc = "A blue mug bearing the logo of your corporate masters. Usually given out at inductions or events, we'll send one out special for a nominal fee."
cost = PAYCHECK_LOWER
contains = list(/obj/item/reagent_containers/cup/glass/mug/nanotrasen)

/datum/supply_pack/goody/coffee_cartridge
name = "Coffee Cartridge"
name = "Coffee Cartridge Single-Pack"
desc = "A basic cartridge for a coffeemaker. Makes 4 pots."
cost = PAYCHECK_LOWER
contains = list(/obj/item/coffee_cartridge)

/datum/supply_pack/goody/coffee_cartridge_fancy
name = "Fancy Coffee Cartridge"
name = "Fancy Coffee Cartridge Single-Pack"
desc = "A fancy cartridge for a coffeemaker. Makes 4 pots."
cost = PAYCHECK_CREW
contains = list(/obj/item/coffee_cartridge/fancy)

/datum/supply_pack/goody/coffeepot
name = "Coffeepot"
name = "Coffeepot Single-Pack"
desc = "A standard-sized coffeepot, for use with a coffeemaker."
cost = PAYCHECK_CREW
contains = list(/obj/item/reagent_containers/cup/coffeepot)

/datum/supply_pack/goody/climbing_hook
name = "Climbing hook"
name = "Climbing Hook Single-Pack"
desc = "A less cheap imported climbing hook. Absolutely no use outside of planetary stations."
cost = PAYCHECK_CREW * 5
contains = list(/obj/item/climbing_hook)

/datum/supply_pack/goody/double_barrel
name = "Double Barrel Shotgun"
desc = "Lost your beloved bunny to a demonic invasion? Clown broke in and stole your beloved gun? No worries! Get a new gun so long as you can pay the absurd fees."
name = "Double-barreled Shotgun Single-Pack"
desc = "Lost your beloved bunny to a demonic invasion? Clown broke in and stole your beloved gun? No worries! Get a new gun as long as you can pay the absurd fees."
cost = PAYCHECK_COMMAND * 18
access_view = ACCESS_WEAPONS
contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel)