Skip to content

New boxes #21439

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

Merged
merged 7 commits into from
Oct 7, 2025
Merged

New boxes #21439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e18ef6f
boxes
nauticall Oct 2, 2025
10ab3c3
box redos
nauticall Oct 3, 2025
be00d4e
The Great Repathening
nauticall Oct 3, 2025
a2e03c4
actual box icons
nauticall Oct 3, 2025
d0bc7b4
The Great Repathening pt. 2
nauticall Oct 3, 2025
352ba61
holy moly
nauticall Oct 3, 2025
181ad1c
cl
nauticall Oct 3, 2025
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: 2 additions & 0 deletions code/__DEFINES/color.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@
#define COLOR_LINOLEUM "#4E4D41"
#define COLOR_LEATHER "#5C4831"
#define COLOR_RAIDER "#6C7364"
#define COLOR_CARDBOARD "#7A7F8B"
#define COLOR_REDBOX "#B62B2B"

#define COLOR_TOOLS "#eac041"

Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/coalition.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
suit_store = /obj/item/gun/projectile/shotgun/pump/combat
backpack_contents = list(
/obj/item/plastique = 3,
/obj/item/storage/box/shotgunshells = 1,
/obj/item/storage/box/shells/buckshot = 1,
/obj/item/ammo_magazine/c45m = 3,
/obj/item/handcuffs/ziptie = 1,
/obj/item/clothing/glasses/welding/superior = 1,
Expand Down
4 changes: 2 additions & 2 deletions code/datums/outfits/ert/fsf.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
backpack_contents = list(
/obj/item/storage/firstaid/combat = 1,
/obj/item/ammo_magazine/mc9mm = 2,
/obj/item/storage/box/shotgunshells = 1,
/obj/item/storage/box/shells/buckshot = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
Expand Down Expand Up @@ -81,7 +81,7 @@
/obj/item/melee/energy/sword/knife/sol = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/clothing/glasses/welding/superior = 1,
/obj/item/storage/box/shotgunshells = 1,
/obj/item/storage/box/shells/buckshot = 1,
/obj/item/gun/projectile/pistol/sol = 1,
/obj/item/ammo_magazine/mc9mm = 2,
/obj/item/grenade/frag = 2
Expand Down
12 changes: 6 additions & 6 deletions code/datums/outfits/ert/hephaestus_ert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

backpack_contents = list(
/obj/item/gun/projectile/sec/lethal = 1,
/obj/item/storage/box/shotgunammo = 1,
/obj/item/storage/box/shotgunshells = 1
/obj/item/storage/box/shells/slugs = 1,
/obj/item/storage/box/shells/buckshot = 1
)

id_iff = IFF_HEPH
Expand Down Expand Up @@ -63,8 +63,8 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/shield/energy = 1,
/obj/item/gun/projectile/sec/lethal = 1,
/obj/item/storage/box/shotgunammo = 1,
/obj/item/storage/box/shotgunshells = 1
/obj/item/storage/box/shells/slugs = 1,
/obj/item/storage/box/shells/buckshot = 1
)

belt_contents = list(
Expand Down Expand Up @@ -95,8 +95,8 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/clothing/glasses/welding/superior = 1,
/obj/item/gun/projectile/sec/lethal = 1,
/obj/item/storage/box/shotgunammo = 1,
/obj/item/storage/box/shotgunshells = 1
/obj/item/storage/box/shells/slugs = 1,
/obj/item/storage/box/shells/buckshot = 1
)
belt_contents = null

Expand Down
8 changes: 4 additions & 4 deletions code/datums/outfits/ert/kataphract.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/energy/hegemony/kataphract = 1,
/obj/item/crowbar = 1,
/obj/item/storage/box/donkpockets = 1
/obj/item/storage/box/unique/donkpockets = 1
)

id_iff = IFF_KATAPHRACT
Expand Down Expand Up @@ -58,8 +58,8 @@
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/energy/hegemony/kataphract = 1,
/obj/item/crowbar = 1,
/obj/item/storage/box/smokebombs = 1,
/obj/item/storage/box/anti_photons = 1,
/obj/item/storage/box/tactical/smokebombs = 1,
/obj/item/storage/box/tactical/anti_photons = 1,
/obj/item/reagent_containers/food/snacks/koisbar_clean = 3
)

Expand Down Expand Up @@ -99,7 +99,7 @@
backpack_contents = list(
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/energy/hegemony = 1,
/obj/item/storage/box/donkpockets = 1,
/obj/item/storage/box/unique/donkpockets = 1,
/obj/item/crowbar = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/device/healthanalyzer = 1,
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/mercenary.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
/obj/item/storage/box/survival = 1,
/obj/item/clothing/glasses/welding/superior = 1,
/obj/item/gun/projectile/shotgun/pump/combat/sol = 1,
/obj/item/storage/box/shotgunshells = 1,
/obj/item/storage/box/shells/buckshot = 1,
/obj/item/landmine/frag = 1,
/obj/item/landmine/emp = 1,
/obj/item/storage/belt/utility/very_full = 1,
Expand Down
14 changes: 7 additions & 7 deletions code/datums/trading/weaponry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
/obj/item/ammo_magazine/mc10mm = TRADER_ALL,
/obj/item/ammo_magazine/mc10mm/leyon = TRADER_BLACKLIST,
/obj/item/ammo_magazine/mc10mm/empty = TRADER_BLACKLIST,
/obj/item/storage/box/ammo10mm = TRADER_THIS_TYPE,
/obj/item/storage/box/ammo/ammo10mm = TRADER_THIS_TYPE,
/obj/item/ammo_magazine/c38 = TRADER_ALL,
/obj/item/ammo_magazine/c45m/auto = TRADER_THIS_TYPE,
/obj/item/storage/box/beanbags = TRADER_THIS_TYPE,
/obj/item/storage/box/shotgunammo = TRADER_THIS_TYPE,
/obj/item/storage/box/shotgunshells = TRADER_THIS_TYPE,
/obj/item/storage/box/haywireshells = TRADER_THIS_TYPE,
/obj/item/storage/box/incendiaryshells = TRADER_THIS_TYPE,
/obj/item/storage/box/governmentammo = TRADER_THIS_TYPE,
/obj/item/storage/box/shells/beanbags = TRADER_THIS_TYPE,
/obj/item/storage/box/shells/slugs = TRADER_THIS_TYPE,
/obj/item/storage/box/shells/buckshot = TRADER_THIS_TYPE,
/obj/item/storage/box/shells/haywireshells = TRADER_THIS_TYPE,
/obj/item/storage/box/shells/incendiaryshells = TRADER_THIS_TYPE,
/obj/item/storage/box/ammo/governmentammo = TRADER_THIS_TYPE,
/obj/item/clothing/accessory/holster = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/accessory/holster/thigh/fluff = TRADER_BLACKLIST_ALL
)
Expand Down
4 changes: 2 additions & 2 deletions code/datums/uplink/ammunition.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@

/datum/uplink_item/item/ammo/shotgun_shells
name = "Box of Shells"
path = /obj/item/storage/box/shotgunshells
path = /obj/item/storage/box/shells/buckshot
desc = "Contains eight shotgun buckshot shells."

/datum/uplink_item/item/ammo/government
name = "Box of .45-70 Govt. ammo"
telecrystal_cost = 2
path = /obj/item/storage/box/governmentammo
path = /obj/item/storage/box/ammo/governmentammo
desc = "Contains eight .45-70 Govt. bullets."

/datum/uplink_item/item/ammo/plasma_mag
Expand Down
10 changes: 5 additions & 5 deletions code/datums/uplink/grenades.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@
name = "5xSmoke Grenades"
telecrystal_cost = 1
bluecrystal_cost = 1
path = /obj/item/storage/box/smokes
path = /obj/item/storage/box/tactical/smokes
desc = "A box of five grenades that deploy smoke in the thrown area. Targets hidden in smoke are much harder to hit with ranged weaponry."

/datum/uplink_item/item/grenades/emp
name = "5xEMP Grenades"
telecrystal_cost = 2
path = /obj/item/storage/box/emps
path = /obj/item/storage/box/tactical/emps
desc = "A box of five grenades that cause a risky EMP explosion, capable of toggling headsets off, permanently destroying IPC units and draining a stationbound completely."

/datum/uplink_item/item/grenades/frag
name = "5xFrag Grenades"
telecrystal_cost = 6
path = /obj/item/storage/box/frags
path = /obj/item/storage/box/tactical/frags

/datum/uplink_item/item/grenades/cardox
name = "5xCardox Grenades"
telecrystal_cost = 2
path = /obj/item/storage/box/cardox
path = /obj/item/storage/box/tactical/cardox
desc = "A box of five grenades that deploy cardox smoke in the thrown area. This smoke is incredibly toxic, especially to vaurca. It can also clear K'ois outbreaks with ease."

/datum/uplink_item/item/grenades/napalm
name = "3x Napalm Grenades"
telecrystal_cost = 8
path = /obj/item/storage/box/grenades/napalm
path = /obj/item/storage/box/tactical/napalm
desc = "A box of three grenades that deploy napalm in the thrown area, and ignite it."
2 changes: 1 addition & 1 deletion code/datums/uplink/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/datum/uplink_item/item/medical/sinpockets
name = "Box of Sin-Pockets"
bluecrystal_cost = 1
path = /obj/item/storage/box/sinpockets
path = /obj/item/storage/box/unique/donkpockets/sinpockets

/datum/uplink_item/item/medical/lunchbox
name = "Tactical Lunchbox"
Expand Down
2 changes: 1 addition & 1 deletion code/datums/uplink/stealth and camouflage items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
desc = "Snap pops with a compound added which deploys a small smokescreen upon exploding."
telecrystal_cost = 1
bluecrystal_cost = 1
path = /obj/item/storage/box/snappops/syndi
path = /obj/item/storage/box/unique/snappops/syndi

/datum/uplink_item/item/stealth_items/closet_teleporter
name = "Closet Teleportation Set-up"
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/civilian.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
messengerbag_faction = /obj/item/storage/backpack/messenger/nt

backpack_contents = list(
/obj/item/storage/box/produce = 1
/obj/item/storage/box/large/produce = 1
)

/datum/job/hydro
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/vending/food.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
/obj/item/storage/box/fancy/toptarts_strawberry = 3,
/obj/item/storage/box/fancy/toptarts_chocolate_peanutbutter = 3,
/obj/item/storage/box/fancy/toptarts_blueberry = 3,
/obj/item/storage/box/donkpockets = 3
/obj/item/storage/box/unique/donkpockets = 3
)
premium = list(
/obj/item/storage/box/fancy/packaged_mossburger = 2
Expand All @@ -115,5 +115,5 @@
/obj/item/storage/box/fancy/toptarts_strawberry = 5.00,
/obj/item/storage/box/fancy/toptarts_chocolate_peanutbutter = 5.00,
/obj/item/storage/box/fancy/toptarts_blueberry = 5.00,
/obj/item/storage/box/donkpockets = 11.00
/obj/item/storage/box/unique/donkpockets = 11.00
)
8 changes: 4 additions & 4 deletions code/game/machinery/vending/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
req_access = list(ACCESS_SECURITY)
vend_id = "tactical" // Refill cartridge DNE 2025/07
products = list(
/obj/item/storage/box/shotgunammo = 2,
/obj/item/storage/box/shotgunshells = 2,
/obj/item/storage/box/shells/slugs = 2,
/obj/item/storage/box/shells/buckshot = 2,
/obj/item/ammo_magazine/c45m = 6,
/obj/item/grenade/chem_grenade/teargas = 6,
/obj/item/ammo_magazine/mc9mmt = 2,
Expand All @@ -91,8 +91,8 @@
req_access = list(ACCESS_SECURITY)
vend_id = "ert" // Refill cartridge DNE 2025/07
products = list(
/obj/item/storage/box/shotgunammo = 2,
/obj/item/storage/box/shotgunshells = 2,
/obj/item/storage/box/shells/slugs = 2,
/obj/item/storage/box/shells/buckshot = 2,
/obj/item/grenade/chem_grenade/gas = 6,
/obj/item/clothing/mask/gas/tactical = 8,
/obj/item/shield/riot/tact = 4,
Expand Down
Loading
Loading