* Thoroughly resprites boxes. They're now more modular and, importantly,
colorable.
* Resprites cardboard, as a material.
* Repaths boxes behind the scenes to be more object-oriented, with boxes
being resorted into their own subtypes. You might notice this in the
gargantuan amount of files this PR changes.

Part of a bigger (yet modestly-sized still) resprites project. Atomized
the boxes bit into this PR specifically so that any conflicts don't
destroy any other spriting PRs.

<img width="652" height="273" alt="image"
src="https://github.com/user-attachments/assets/5590b22d-c9d7-49b5-9adf-0b6e01a6962b"
/>

<img width="383" height="345" alt="image"
src="https://github.com/user-attachments/assets/aab83040-2d5d-4283-b019-3d6bed2e3e47"
/>

<img width="142" height="343" alt="image"
src="https://github.com/user-attachments/assets/75a98d36-0171-4e48-9dec-de5511f35d39"
/>

<img width="127" height="225" alt="image"
src="https://github.com/user-attachments/assets/a1ff8b1b-bd2a-4c0d-b538-32fe401724c3"
/>

<img width="334" height="399" alt="image"
src="https://github.com/user-attachments/assets/e41330ac-ed4a-4e81-a87a-5ba901b47b5c"
/>
This commit is contained in:
naut
2025-10-07 16:59:55 +00:00
committed by GitHub
parent aa22ad931b
commit dfe57a310f
177 changed files with 1147 additions and 1117 deletions
+2
View File
@@ -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"
+1 -1
View File
@@ -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,
+2 -2
View File
@@ -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,
@@ -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
+6 -6
View File
@@ -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
@@ -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(
@@ -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
+4 -4
View File
@@ -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
@@ -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
)
@@ -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,
+1 -1
View File
@@ -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,
+7 -7
View File
@@ -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
)
+2 -2
View File
@@ -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
+5 -5
View File
@@ -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."
+1 -1
View File
@@ -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"
@@ -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"
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
@@ -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
)
+4 -4
View File
@@ -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,
@@ -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,
File diff suppressed because it is too large Load Diff
@@ -25,6 +25,7 @@
var/opened_icon_state = null //for items that have unique base icons but look the same opened, such as all the various microwave pizzas.
foldable = null // most of this stuff isn't foldable by default, e.g. cig packets and vial boxes
contained_sprite = TRUE
color = COLOR_WHITE
/obj/item/storage/box/fancy/mechanics_hints(mob/user, distance, is_adjacent)
. += ..()
@@ -1,7 +1,8 @@
/obj/item/storage/box/syndie_kit
name = "box"
desc = "A sleek, sturdy box."
icon_state = "syndiebox"
color = COLOR_WALL_GUNMETAL
label = "label_syndie"
worn_overlay = "writing_syndie"
/obj/item/storage/box/syndie_kit/imp_freedom
+4 -4
View File
@@ -108,8 +108,8 @@
/obj/item/spacecash/ewallet/lotto = 0.3,
/obj/item/staff/broom = 0.5,
/obj/item/storage/bag/plasticbag = 1,
/obj/item/storage/box/condimentbottles = 0.2,
/obj/item/storage/box/donkpockets = 0.6,
/obj/item/storage/box/large/condimentbottles = 0.2,
/obj/item/storage/box/unique/donkpockets = 0.6,
/obj/item/storage/box/drinkingglasses = 0.2,
/obj/item/storage/box/lights = 0.5,
/obj/item/storage/box/lights/colored/blue = 0.1,
@@ -123,7 +123,7 @@
/obj/item/storage/box/cleaner_tablets = 0.4,
/obj/item/storage/box/mousetraps = 0.3,
/obj/item/storage/box/pineapple = 0.1,
/obj/item/storage/box/smokebombs = 0.1,
/obj/item/storage/box/tactical/smokebombs = 0.1,
/obj/item/storage/box/syringes = 0.3,
/obj/item/storage/box/fancy/cigarettes = 1.2,
/obj/item/storage/box/fancy/cigarettes/acmeco = 0.3,
@@ -343,7 +343,7 @@
/obj/item/reagent_containers/syringe/heroin = 1,
/obj/item/reagent_containers/inhaler/raskara_dust = 2,
/obj/item/reagent_containers/inhaler/space_drugs = 2,
/obj/item/storage/box/smokes = 0.7,
/obj/item/storage/box/tactical/smokes = 0.7,
/obj/item/grenade/napalm = 0.4,
/obj/item/reagent_containers/glass/beaker/vial/random/toxin = 1,
/obj/item/material/knife/butterfly = 2,
+1 -1
View File
@@ -170,7 +170,7 @@
desc = "Arcade loot!"
icon_state = "toy"
spawnlist = list(
/obj/item/storage/box/snappops = 11,
/obj/item/storage/box/unique/snappops = 11,
/obj/item/clothing/under/syndicate/tacticool = 5,
/obj/item/toy/sword = 22,
/obj/item/gun/projectile/revolver/capgun = 11,
+4 -4
View File
@@ -36,10 +36,10 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "45-10"
problist = list(
/obj/item/storage/box/beanbags = 6,
/obj/item/storage/box/shotgunammo = 2,
/obj/item/storage/box/shotgunshells = 4,
/obj/item/storage/box/stunshells = 1,
/obj/item/storage/box/shells/beanbags = 6,
/obj/item/storage/box/shells/slugs = 2,
/obj/item/storage/box/shells/buckshot = 4,
/obj/item/storage/box/shells/stunshells = 1,
/obj/item/ammo_magazine/c45m = 2,
/obj/item/ammo_magazine/c45m/rubber = 4,
/obj/item/ammo_magazine/c45m/flash = 4,
@@ -91,9 +91,9 @@
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
@@ -115,9 +115,9 @@
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
@@ -48,7 +48,7 @@
new /obj/item/device/megaphone/sci(src)
new /obj/item/device/taperecorder(src)
new /obj/item/sampler(src)
new /obj/item/storage/box/tranquilizer(src)
new /obj/item/storage/box/shells/tranquilizer(src)
/// Used for when we want to populate the contents of this locker ourself. Good for away sites
/obj/structure/closet/secure_closet/RD/empty
@@ -105,9 +105,9 @@
/obj/structure/closet/secure_closet/hos/fill()
..()
//Supply
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/storage/box/ids(src)
new /obj/item/storage/box/stingers(src)
new /obj/item/storage/box/tactical/stingers(src)
//Appearance
if(prob(50))
new /obj/item/storage/backpack/security(src)
@@ -179,9 +179,9 @@
/obj/structure/closet/secure_closet/warden/fill()
//Supply
new /obj/item/storage/box/ids(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/teargas(src)
new /obj/item/storage/box/stingers(src)
new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/storage/box/tactical/teargas(src)
new /obj/item/storage/box/tactical/stingers(src)
//Appearance
if(prob(50))
new /obj/item/storage/backpack/security(src)
@@ -41,8 +41,8 @@
new /obj/item/ammo_magazine/a10mm(src)
new /obj/item/ammo_magazine/a10mm(src)
new /obj/item/storage/box/handcuffs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/stingers(src)
new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/storage/box/tactical/stingers(src)
new /obj/item/gun/energy/gun(src)
new /obj/item/gun/energy/gun(src)
new /obj/item/gun/energy/gun(src)
@@ -638,7 +638,7 @@
new /obj/item/storage/box/kitchen(src)
new /obj/item/reagent_containers/spray/cleaner(src)
new /obj/item/storage/box/gloves(src)
new /obj/item/storage/box/condiment(src)
new /obj/item/storage/box/large/condiment(src)
//A crate that populates itself with randomly selected loot from randomstock.dm
//Can be passed in a rarity value, which is used as a multiplier on the rare/uncommon chance
+2 -2
View File
@@ -153,7 +153,7 @@
/obj/item/spacecash/c10 = 3,
/obj/item/spacecash/c20 = 3,
/obj/item/storage/backpack/duffel = 3,
/obj/item/storage/box/donkpockets = 3,
/obj/item/storage/box/unique/donkpockets = 3,
/obj/item/storage/box/mousetraps = 3,
/obj/item/storage/wallet = 3,
/obj/item/clothing/gloves/yellow/budget = 2,
@@ -170,7 +170,7 @@
/obj/item/cell/super = 2,
/obj/item/contraband/poster = 2,
/obj/item/reagent_containers/glass/rag = 2,
/obj/item/storage/box/sinpockets = 2,
/obj/item/storage/box/unique/donkpockets/sinpockets = 2,
/obj/item/storage/secure/briefcase = 2,
/obj/item/clothing/glasses/sunglasses = 1,
/obj/item/clothing/glasses/welding = 1,
+4 -4
View File
@@ -173,7 +173,7 @@
description = "A large box of random, leftover produce."
price = 35
items = list(
/obj/item/storage/box/produce
/obj/item/storage/box/large/produce
)
access = 0
container_type = "crate"
@@ -1388,7 +1388,7 @@
description = "A box containing some tins of green tea leaves."
price = 20
items = list(
/obj/item/storage/box/tea
/obj/item/storage/box/unique/tea
)
access = 0
container_type = "crate"
@@ -1401,7 +1401,7 @@
description = "A box containing some tins of oolong tea leaves."
price = 20
items = list(
/obj/item/storage/box/tea/tieguanyin
/obj/item/storage/box/unique/tea/tieguanyin
)
access = 0
container_type = "crate"
@@ -1414,7 +1414,7 @@
description = "A box containing some tins of black tea leaves."
price = 20
items = list(
/obj/item/storage/box/tea/jaekseol
/obj/item/storage/box/unique/tea/jaekseol
)
access = 0
container_type = "crate"
+1 -1
View File
@@ -753,7 +753,7 @@
description = "A sealed, cooled container to keep organs from decaying."
price = 300
items = list(
/obj/item/storage/box/freezer/organcooler
/obj/item/storage/box/unique/freezer/organcooler
)
access = ACCESS_MEDICAL
container_type = "crate"
+5 -5
View File
@@ -5,7 +5,7 @@
description = "Drymate brand stok cubes, shipped from Moghes. Just add water!"
price = 250
items = list(
/obj/item/storage/box/monkeycubes/stokcubes
/obj/item/storage/box/unique/monkeycubes/stokcubes
)
access = 0
container_type = "crate"
@@ -19,7 +19,7 @@
description = "Drymate brand vkrexi cubes. Just add water!"
price = 250
items = list(
/obj/item/storage/box/monkeycubes/vkrexicubes
/obj/item/storage/box/unique/monkeycubes/vkrexicubes
)
access = 0
container_type = "crate"
@@ -33,7 +33,7 @@
description = "Drymate brand farwa cubes, shipped from Adhomai. Just add water!"
price = 250
items = list(
/obj/item/storage/box/monkeycubes/farwacubes
/obj/item/storage/box/unique/monkeycubes/farwacubes
)
access = 0
container_type = "crate"
@@ -47,7 +47,7 @@
description = "Drymate brand monkey cubes. Just add water!"
price = 250
items = list(
/obj/item/storage/box/monkeycubes
/obj/item/storage/box/unique/monkeycubes
)
access = 0
container_type = "crate"
@@ -61,7 +61,7 @@
description = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!"
price = 250
items = list(
/obj/item/storage/box/monkeycubes/neaeracubes
/obj/item/storage/box/unique/monkeycubes/neaeracubes
)
access = 0
container_type = "crate"
+3 -3
View File
@@ -133,7 +133,7 @@
description = "A box containing 7 tear gas grenades. A gas mask is printed on the label. WARNING: Exposure carries risk of serious injuries."
price = 450
items = list(
/obj/item/storage/box/teargas
/obj/item/storage/box/tactical/teargas
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -147,7 +147,7 @@
description = "A box containing 7 antipersonnel flashbang grenades. WARNING: Can cause permanent vision or hearing loss. Use with caution."
price = 520
items = list(
/obj/item/storage/box/flashbangs
/obj/item/storage/box/tactical/flashbangs
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -161,7 +161,7 @@
description = "A box containing 5 military grade EMP grenades. WARNING: Do not use near unshielded electronics or biomechanical augmentations."
price = 1450
items = list(
/obj/item/storage/box/emps
/obj/item/storage/box/tactical/emps
)
access = ACCESS_SECURITY
container_type = "crate"
+8 -8
View File
@@ -245,7 +245,7 @@
description = "A box of less-lethal beanbag shells."
price = 65
items = list(
/obj/item/storage/box/beanbags
/obj/item/storage/box/shells/beanbags
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -259,7 +259,7 @@
description = "A box of EMP-inducing 'haywire' shotgun shells."
price = 90
items = list(
/obj/item/storage/box/haywireshells
/obj/item/storage/box/shells/haywireshells
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -273,7 +273,7 @@
description = "A box of incendiary shotgun shells."
price = 95
items = list(
/obj/item/storage/box/incendiaryshells
/obj/item/storage/box/shells/incendiaryshells
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -287,7 +287,7 @@
description = "A box of shotgun buckshot shells."
price = 70
items = list(
/obj/item/storage/box/shotgunshells
/obj/item/storage/box/shells/buckshot
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -301,7 +301,7 @@
description = "A box of shotgun slugs."
price = 80
items = list(
/obj/item/storage/box/shotgunammo
/obj/item/storage/box/shells/slugs
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -315,7 +315,7 @@
description = "A box of illuminating shotgun shells."
price = 65
items = list(
/obj/item/storage/box/flashshells
/obj/item/storage/box/shells/flashshells
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -483,7 +483,7 @@
description = "A box of 50-caliber tranquilizer darts."
price = 50
items = list(
/obj/item/storage/box/tranquilizer
/obj/item/storage/box/shells/tranquilizer
)
access = ACCESS_ARMORY
container_type = "crate"
@@ -497,7 +497,7 @@
description = "A box with several compact tungsten slugs, aimed for use in gauss carbines."
price = 125
items = list(
/obj/item/storage/box/tungstenslugs
/obj/item/storage/box/ammo/tungstenslugs
)
access = ACCESS_ARMORY
container_type = "crate"
+19 -19
View File
@@ -306,7 +306,7 @@ STOCK_ITEM_COMMON(rollerbed, 2.2)
new /obj/item/roller(L)
STOCK_ITEM_COMMON(smokebombs, 1.1)
new /obj/item/storage/box/smokebombs(L)
new /obj/item/storage/box/tactical/smokebombs(L)
STOCK_ITEM_COMMON(jar, 2)
new /obj/item/glass_jar(L)
@@ -428,10 +428,10 @@ STOCK_ITEM_COMMON(snacks, 4)
L = get_turf(pick(CS.tables))
var/list/snacks = list(
/obj/item/storage/box/donkpockets = 10,
/obj/item/storage/box/sinpockets = 5,
/obj/item/storage/box/unique/donkpockets = 10,
/obj/item/storage/box/unique/donkpockets/sinpockets = 5,
/obj/item/storage/box/snack = 10,
/obj/item/storage/box/produce = 8,
/obj/item/storage/box/large/produce = 8,
/obj/item/storage/field_ration = 3,
/obj/item/storage/field_ration/nka = 1
)
@@ -504,7 +504,7 @@ STOCK_ITEM_COMMON(gasmask, 2)
new type(L)
STOCK_ITEM_COMMON(mining, 2)
var/list/mine_items = list(/obj/item/shovel, /obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/excavation)
var/list/mine_items = list(/obj/item/shovel, /obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/unique/excavation)
for(var/i in 1 to rand(1, 2))
var/to_spawn = pick(mine_items)
new to_spawn(L)
@@ -528,20 +528,20 @@ STOCK_ITEM_COMMON(camera, 1)
STOCK_ITEM_COMMON(flagbox, 3)
var/list/flagbox_type = list(
/obj/item/storage/box/flags/sol,
/obj/item/storage/box/flags/biesel,
/obj/item/storage/box/flags/coc,
/obj/item/storage/box/flags/galataea,
/obj/item/storage/box/flags/dominia,
/obj/item/storage/box/flags/elyra,
/obj/item/storage/box/flags/diona,
/obj/item/storage/box/flags/unathi,
/obj/item/storage/box/flags/skrell,
/obj/item/storage/box/flags/tajara,
/obj/item/storage/box/flags/vaurca,
/obj/item/storage/box/flags/goldendeep,
/obj/item/storage/box/flags/corporate,
/obj/item/storage/box/flags/misc
/obj/item/storage/box/large/flags/sol,
/obj/item/storage/box/large/flags/biesel,
/obj/item/storage/box/large/flags/coc,
/obj/item/storage/box/large/flags/galataea,
/obj/item/storage/box/large/flags/dominia,
/obj/item/storage/box/large/flags/elyra,
/obj/item/storage/box/large/flags/diona,
/obj/item/storage/box/large/flags/unathi,
/obj/item/storage/box/large/flags/skrell,
/obj/item/storage/box/large/flags/tajara,
/obj/item/storage/box/large/flags/vaurca,
/obj/item/storage/box/large/flags/goldendeep,
/obj/item/storage/box/large/flags/corporate,
/obj/item/storage/box/large/flags/misc
)
var/type = pick(flagbox_type)
new type(L)
@@ -43,13 +43,13 @@ STOCK_ITEM_UNCOMMON(implants, 1)
if(prob(50))
new /obj/item/storage/box/cdeathalarm_kit(L)
else
new /obj/item/storage/box/trackimp(L)
new /obj/item/storage/box/tactical/trackimp(L)
STOCK_ITEM_UNCOMMON(flashbang, 0.75)
new /obj/item/storage/box/flashbangs(L)
new /obj/item/storage/box/tactical/flashbangs(L)
STOCK_ITEM_UNCOMMON(stinger, 0.75)
new /obj/item/storage/box/stingers(L)
new /obj/item/storage/box/tactical/stingers(L)
STOCK_ITEM_UNCOMMON(arrest, 1)
if(prob(60))
@@ -60,13 +60,13 @@ STOCK_ITEM_UNCOMMON(arrest, 1)
STOCK_ITEM_UNCOMMON(monkey, 2)
if(prob(40))
var/type = pick( \
/obj/item/storage/box/monkeycubes/farwacubes, \
/obj/item/storage/box/monkeycubes/stokcubes, \
/obj/item/storage/box/monkeycubes/neaeracubes \
/obj/item/storage/box/unique/monkeycubes/farwacubes, \
/obj/item/storage/box/unique/monkeycubes/stokcubes, \
/obj/item/storage/box/unique/monkeycubes/neaeracubes \
)
new type(L)
else
new /obj/item/storage/box/monkeycubes(L)
new /obj/item/storage/box/unique/monkeycubes(L)
STOCK_ITEM_UNCOMMON(specialcrayon, 1.5)
if(prob(50))
@@ -340,9 +340,9 @@ STOCK_ITEM_UNCOMMON(wristbound, 0.5)
STOCK_ITEM_UNCOMMON(pops, 0.5)
if(prob(85))
new /obj/item/storage/box/snappops(L)
new /obj/item/storage/box/unique/snappops(L)
else if (prob(25))
new /obj/item/storage/box/snappops/syndi(L)
new /obj/item/storage/box/unique/snappops/syndi(L)
else
new /obj/item/storage/box/partypopper(L)
+1 -1
View File
@@ -10,7 +10,7 @@ STOCK_ITEM_RARE(uranium, 3)
new /obj/item/stack/material/uranium(L, rand(5,30))
STOCK_ITEM_RARE(EMP, 0.75)
new /obj/item/storage/box/emps(L)
new /obj/item/storage/box/tactical/emps(L)
STOCK_ITEM_RARE(hypercell, 3)
new /obj/item/cell/hyper(L)
@@ -172,14 +172,14 @@
display_name = "konyang-cha tins"
description = "Tins of tea leaves made by Konyang-cha."
cost = 1
path = /obj/item/storage/box/tea
path = /obj/item/storage/box/unique/tea
/datum/gear/chatins/New()
..()
var/list/chatins = list()
chatins["sencha cha-tin"] = /obj/item/storage/box/tea
chatins["tieguanyin cha-tin"] = /obj/item/storage/box/tea/tieguanyin
chatins["jaekseol cha-tin"] = /obj/item/storage/box/tea/jaekseol
chatins["sencha cha-tin"] = /obj/item/storage/box/unique/tea
chatins["tieguanyin cha-tin"] = /obj/item/storage/box/unique/tea/tieguanyin
chatins["jaekseol cha-tin"] = /obj/item/storage/box/unique/tea/jaekseol
gear_tweaks += new /datum/gear_tweak/path(chatins)
/datum/gear/teapots
@@ -301,7 +301,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/hazmat
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/storage/box/excavation,/obj/item/pickaxe,/obj/item/device/healthanalyzer,/obj/item/device/measuring_tape,/obj/item/device/ano_scanner,/obj/item/device/depth_scanner,/obj/item/device/core_sampler,/obj/item/device/gps,/obj/item/device/beacon_locator,/obj/item/device/radio/beacon,/obj/item/pickaxe/hand,/obj/item/storage/bag/fossils,/obj/item/material/twohanded/fireaxe,/obj/item/device/breath_analyzer)
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/storage/box/unique/excavation,/obj/item/pickaxe,/obj/item/device/healthanalyzer,/obj/item/device/measuring_tape,/obj/item/device/ano_scanner,/obj/item/device/depth_scanner,/obj/item/device/core_sampler,/obj/item/device/gps,/obj/item/device/beacon_locator,/obj/item/device/radio/beacon,/obj/item/pickaxe/hand,/obj/item/storage/bag/fossils,/obj/item/material/twohanded/fireaxe,/obj/item/device/breath_analyzer)
req_access = list()
req_one_access = list()
+4 -4
View File
@@ -104,7 +104,7 @@
var/gift_type = pick(
/obj/item/storage/wallet,
/obj/item/storage/photo_album,
/obj/item/storage/box/snappops,
/obj/item/storage/box/unique/snappops,
/obj/item/storage/box/fancy/crayons,
/obj/item/storage/belt/champion,
/obj/item/soap/deluxe,
@@ -202,7 +202,7 @@
/obj/random/wizard_dressup,
/obj/item/storage/wallet,
/obj/item/storage/photo_album,
/obj/item/storage/box/snappops,
/obj/item/storage/box/unique/snappops,
/obj/item/storage/box/fancy/crayons,
/obj/item/soap/deluxe,
/obj/item/pen/invisible,
@@ -294,7 +294,7 @@
/obj/item/device/paicard,
/obj/item/clothing/accessory/horrible,
/obj/item/clothing/shoes/heels,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/unique/donkpockets,
/obj/item/reagent_containers/glass/beaker/teapot,
/obj/item/device/flashlight/lantern,
/obj/item/clothing/mask/balaclava,
@@ -366,7 +366,7 @@
/mob/living/simple_animal/parrot,
/mob/living/simple_animal/hostile/commanded/dog/pug,
/obj/item/target/alien,
/obj/item/storage/box/candy)
/obj/item/storage/box/large/candy)
return picked_gift_type
+2 -2
View File
@@ -188,13 +188,13 @@
..()
recipes += new /datum/stack_recipe_list("[display_name] recipes",
list(
new /datum/stack_recipe("box", /obj/item/storage/box),
new /datum/stack_recipe("box", /obj/item/storage/box/blank),
new /datum/stack_recipe("donut box", /obj/item/storage/box/fancy/donut/empty),
new /datum/stack_recipe("egg carton", /obj/item/storage/box/fancy/egg_box),
new /datum/stack_recipe("candle pack", /obj/item/storage/box/fancy/candle_box/empty),
new /datum/stack_recipe("crayon box", /obj/item/storage/box/fancy/crayons/empty),
new /datum/stack_recipe("pizza box", /obj/item/pizzabox),
new /datum/stack_recipe("papersack", /obj/item/storage/box/papersack),
new /datum/stack_recipe("papersack", /obj/item/storage/box/unique/papersack),
new /datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3),
new /datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg)
))
+1 -1
View File
@@ -891,7 +891,7 @@
stack_type = /obj/item/stack/material/cardboard
flags = MATERIAL_BRITTLE
integrity = 10
icon_colour = "#AAAAAA"
icon_colour = COLOR_CARDBOARD
hardness = 1
weight = 1
protectiveness = 0 // 0%
+1 -1
View File
@@ -152,7 +152,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
// Don't process if we're in a freezer, an MMI or a stasis bag.or a freezer or something I dunno
if(istype(loc,/obj/item/device/mmi))
return
if(istype(loc,/obj/structure/closet/body_bag/cryobag) || istype(loc,/obj/structure/closet/crate/freezer) || istype(loc,/obj/item/storage/box/freezer))
if(istype(loc,/obj/structure/closet/body_bag/cryobag) || istype(loc,/obj/structure/closet/crate/freezer) || istype(loc,/obj/item/storage/box/unique/freezer))
return
//Process infections
if ((status & ORGAN_ROBOT) || (owner && owner.species && (owner.species.flags & IS_PLANT)))
@@ -41,7 +41,7 @@
/datum/design/item/mining/pick_set
req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
materials = list(DEFAULT_WALL_MATERIAL = 1700, MATERIAL_GLASS = 200)
build_path = /obj/item/storage/box/excavation
build_path = /obj/item/storage/box/unique/excavation
//Frames
/datum/design/item/mining/ka_frame01
@@ -27,7 +27,7 @@
new /obj/item/clothing/glasses/safety/goggles/science(src)
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/storage/belt/archaeology(src)
new /obj/item/storage/box/excavation(src)
new /obj/item/storage/box/unique/excavation(src)
new /obj/item/taperoll/science(src)
new /obj/item/clothing/head/hardhat(src)
new /obj/item/sampler(src)
@@ -39,7 +39,7 @@
/obj/structure/closet/excavation/fill()
new /obj/item/storage/belt/archaeology(src)
new /obj/item/storage/box/excavation(src)
new /obj/item/storage/box/unique/excavation(src)
new /obj/item/device/flashlight/lantern(src)
new /obj/item/device/ano_scanner(src)
new /obj/item/device/depth_scanner(src)
@@ -26,7 +26,7 @@
/obj/item/anodevice,
/obj/item/clothing/glasses,
/obj/item/wrench,
/obj/item/storage/box/excavation,
/obj/item/storage/box/unique/excavation,
/obj/item/anobattery,
/obj/item/device/ano_scanner,
/obj/item/ore_detector,
@@ -39,7 +39,7 @@
/obj/item/device/gps = 1,
/obj/item/device/measuring_tape = 1,
/obj/item/pickaxe/hand = 1,
/obj/item/storage/box/excavation = 1,
/obj/item/storage/box/unique/excavation = 1,
/obj/item/device/depth_scanner = 1,
/obj/item/device/ano_scanner = 1,
/obj/item/ore_detector = 1,
@@ -156,13 +156,13 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Pack for holding pickaxes
/obj/item/storage/box/excavation
/obj/item/storage/box/unique/excavation
name = "excavation pick set"
icon = 'icons/obj/storage/boxes.dmi'
icon_state = "excavation"
desc = "A rugged metal case containing a set of standardized picks used in archaeological digs."
item_state = "box"
foldable = /obj/item/stack/material/cardboard //BubbleWrap
foldable = null
storage_slots = 7
w_class = WEIGHT_CLASS_SMALL
can_hold = list(/obj/item/pickaxe/brush,\
@@ -176,7 +176,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try
/obj/item/storage/box/excavation/fill()
/obj/item/storage/box/unique/excavation/fill()
..()
new /obj/item/pickaxe/brush(src)
new /obj/item/pickaxe/one_pick(src)
+59
View File
@@ -0,0 +1,59 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################
# Your name.
author: nauticall
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- imageadd: "Resprited boxes; made them both colorable and modular."
- code_imp: "Repathed box paths behind the scenes."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

@@ -1458,10 +1458,10 @@
/obj/structure/table/reinforced/steel,
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/structure/extinguisher_cabinet/east,
/obj/item/storage/box/condiment{
/obj/item/storage/box/large/condiment{
pixel_y = 13
},
/obj/item/storage/box/condiment{
/obj/item/storage/box/large/condiment{
pixel_y = 3
},
/turf/simulated/floor/tiled/dark,
@@ -13290,7 +13290,7 @@
/turf/simulated/floor/plating,
/area/abandoned_industrial_station/hangar)
"Qc" = (
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -1200,7 +1200,7 @@
/turf/simulated/floor,
/area/cursed/engineering)
"gZj" = (
/obj/item/storage/box/dynamite,
/obj/item/storage/box/unique/dynamite,
/turf/template_noop,
/area/space)
"hdf" = (
@@ -1757,7 +1757,7 @@
/area/cursed/computer_core)
"kLZ" = (
/obj/structure/table/steel,
/obj/item/storage/box/dynamite,
/obj/item/storage/box/unique/dynamite,
/turf/simulated/floor/exoplanet/asteroid/ash/rocky,
/area/space)
"kMz" = (
@@ -2736,8 +2736,8 @@
/area/cursed/living_area)
"pYQ" = (
/obj/structure/table/steel,
/obj/item/storage/box/dynamite,
/obj/item/storage/box/dynamite{
/obj/item/storage/box/unique/dynamite,
/obj/item/storage/box/unique/dynamite{
pixel_y = 11
},
/turf/simulated/floor/exoplanet/asteroid/ash/rocky,
+1 -1
View File
@@ -1029,7 +1029,7 @@
/area/bluespaceriver/ship)
"Va" = (
/obj/structure/closet/excavation,
/obj/item/storage/box/flares,
/obj/item/storage/box/large/flares,
/turf/simulated/floor/exoplanet/barren{
temperature = 250
},
@@ -733,8 +733,8 @@
"jX" = (
/obj/effect/floor_decal/corner_wide/black/diagonal,
/obj/structure/closet/crate/freezer,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/meat/chicken,
@@ -1787,7 +1787,7 @@
/area/crystal_planet_outpost/living)
"zW" = (
/obj/structure/table/standard,
/obj/item/storage/box/excavation{
/obj/item/storage/box/unique/excavation{
pixel_x = -2;
pixel_y = 7
},
@@ -2081,7 +2081,7 @@
/area/crystal_planet_outpost/medbay)
"DG" = (
/obj/item/storage/belt/archaeology,
/obj/item/storage/box/excavation,
/obj/item/storage/box/unique/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
@@ -3084,11 +3084,11 @@
/area/crystal_planet_outpost/surface)
"QD" = (
/obj/structure/table/wood,
/obj/item/storage/box/tea/tieguanyin{
/obj/item/storage/box/unique/tea/tieguanyin{
pixel_x = 6;
pixel_y = 3
},
/obj/item/storage/box/tea/jaekseol{
/obj/item/storage/box/unique/tea/jaekseol{
pixel_x = -5;
pixel_y = 7
},
@@ -3695,7 +3695,7 @@
/obj/structure/closet/crate/freezer{
name = "Fridge"
},
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/white,
/area/crystal_planet_outpost/medbay)
"ZH" = (
@@ -265,7 +265,7 @@
/turf/simulated/floor/tiled,
/area/template_noop)
"le" = (
/obj/item/storage/box/excavation{
/obj/item/storage/box/unique/excavation{
pixel_x = -9;
pixel_y = 7
},
@@ -819,7 +819,7 @@
"Bp" = (
/obj/random/dirt_75,
/obj/item/storage/belt/archaeology,
/obj/item/storage/box/excavation,
/obj/item/storage/box/unique/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
@@ -1083,7 +1083,7 @@
/area/template_noop)
"GP" = (
/obj/item/storage/belt/archaeology,
/obj/item/storage/box/excavation,
/obj/item/storage/box/unique/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
@@ -1423,7 +1423,7 @@
/turf/simulated/floor/tiled/dark,
/area/template_noop)
"RL" = (
/obj/item/storage/box/excavation{
/obj/item/storage/box/unique/excavation{
pixel_x = -9;
pixel_y = 7
},
+2 -2
View File
@@ -4642,7 +4642,7 @@
dir = 1
},
/obj/random/dirt_75,
/obj/item/storage/box/excavation{
/obj/item/storage/box/unique/excavation{
pixel_x = 8;
pixel_y = -2
},
@@ -9135,7 +9135,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/drinks/carton/applejuice,
/obj/random/dirt_75,
/turf/simulated/floor/tiled/white,
@@ -863,7 +863,7 @@
/turf/simulated/floor/airless,
/area/derelict/hallway/northeast)
"de" = (
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/tactical/flashbangs,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/airless,
/area/derelict/hallway/northeast)
@@ -1991,7 +1991,7 @@
/turf/template_noop,
/area/template_noop)
"gE" = (
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/tactical/flashbangs,
/turf/template_noop,
/area/template_noop)
"gF" = (
@@ -3294,7 +3294,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
/obj/item/storage/box/shotgunammo,
/obj/item/storage/box/shells/slugs,
/turf/simulated/floor/tiled/dark/full/airless,
/area/hivebothub/portdocks)
"vW" = (
@@ -4256,8 +4256,8 @@
opened = 1
},
/obj/item/gun/energy/disruptorpistol,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/shells/beanbags,
/obj/item/storage/box/shells/beanbags,
/turf/simulated/floor/tiled/dark/full/airless,
/area/hivebothub/bridge)
"Co" = (
@@ -575,8 +575,8 @@
},
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/storage/box/shotgunammo,
/obj/item/storage/box/shotgunammo,
/obj/item/storage/box/shells/slugs,
/obj/item/storage/box/shells/slugs,
/turf/simulated/floor/tiled,
/area/idris_wreck/armory)
"fD" = (
@@ -1601,8 +1601,8 @@
/obj/random/tool,
/obj/item/storage/box/lights,
/obj/item/storage/box/lights/coloredmixed,
/obj/item/storage/box/papersack,
/obj/item/storage/box/candy,
/obj/item/storage/box/unique/papersack,
/obj/item/storage/box/large/candy,
/obj/item/storage/box/cups,
/obj/item/storage/box/fancy/cigarettes/dromedaryco,
/obj/random/dirt_75,
@@ -3331,7 +3331,7 @@
/obj/item/storage/box/magnetic_locks{
pixel_y = -6
},
/obj/item/storage/box/flares{
/obj/item/storage/box/large/flares{
pixel_y = 5
},
/obj/random/dirt_75,
@@ -7061,9 +7061,9 @@
/area/point_verdant/interior/hotel)
"dQO" = (
/obj/structure/table/rack/retail_shelf,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce{
pixel_y = 11
},
/turf/simulated/floor/tiled,
@@ -9253,7 +9253,7 @@
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/OPlus,
/obj/item/reagent_containers/blood/OMinus,
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/obj/item/soap/syndie,
/obj/item/reagent_containers/glass/rag,
/turf/simulated/floor/tiled/white,
@@ -13935,7 +13935,7 @@
pixel_x = -4;
pixel_y = 6
},
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_x = 2;
pixel_y = -1
},
@@ -15040,7 +15040,7 @@
/area/point_verdant/outdoors)
"iwH" = (
/obj/structure/table/rack,
/obj/item/storage/box/flares,
/obj/item/storage/box/large/flares,
/obj/machinery/light/small{
dir = 4
},
@@ -19981,39 +19981,39 @@
/turf/simulated/floor/exoplanet/konyang,
/area/point_verdant/outdoors)
"lnl" = (
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 15
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 15
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 15
},
@@ -23108,7 +23108,7 @@
/obj/structure/table/wood,
/obj/item/device/toner,
/obj/item/device/toner,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/unique/donkpockets,
/turf/simulated/floor/wood,
/area/point_verdant/interior/tailor)
"mUB" = (
@@ -28755,7 +28755,7 @@
"qyA" = (
/obj/structure/rod_railing,
/obj/structure/table/wood,
/obj/item/storage/box/donkpockets{
/obj/item/storage/box/unique/donkpockets{
pixel_y = 6;
pixel_x = -11
},
@@ -37446,9 +37446,9 @@
/area/point_verdant/interior/shallow)
"vFC" = (
/obj/structure/table/rack/retail_shelf,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce{
pixel_y = 11
},
/obj/machinery/light/small,
+16 -16
View File
@@ -1458,13 +1458,13 @@
"gM" = (
/obj/random/dirt_75,
/obj/structure/closet/secure_closet/refrigerator/standard,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/machinery/button/remote/airlock{
id = "pirate_base_freezer_door";
specialfunctions = 4;
@@ -3175,11 +3175,11 @@
"pd" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/structure/table/rack,
/obj/item/storage/box/donkpockets{
/obj/item/storage/box/unique/donkpockets{
pixel_x = 6;
pixel_y = 6
},
/obj/item/storage/box/donkpockets{
/obj/item/storage/box/unique/donkpockets{
pixel_x = -3;
pixel_y = 1
},
@@ -3529,7 +3529,7 @@
/obj/machinery/body_scanconsole{
dir = 4
},
/obj/item/storage/box/freezer/organcooler{
/obj/item/storage/box/unique/freezer/organcooler{
pixel_y = -9;
pixel_x = -12
},
@@ -8695,15 +8695,15 @@
/area/piratebase/hallway_south)
"Ri" = (
/obj/structure/closet/crate/freezer,
/obj/item/storage/box/freezer/organcooler{
/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 3
},
/obj/item/storage/box/freezer/organcooler{
/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 3
},
/obj/item/storage/box/freezer/organcooler{
/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 3
},
@@ -8864,7 +8864,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -10102,11 +10102,11 @@
"Ya" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/structure/table/rack,
/obj/item/storage/box/smokebombs{
/obj/item/storage/box/tactical/smokebombs{
pixel_x = 6;
pixel_y = 6
},
/obj/item/storage/box/flashbangs{
/obj/item/storage/box/tactical/flashbangs{
pixel_x = -3
},
/obj/machinery/light{
+3 -3
View File
@@ -456,7 +456,7 @@
/obj/item/material/knife{
pixel_x = -9
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3
},
/turf/simulated/floor/tiled/white,
@@ -2958,7 +2958,7 @@
"olo" = (
/obj/structure/dispenser/oxygen,
/obj/item/tank/oxygen,
/obj/item/storage/box/stunshells{
/obj/item/storage/box/shells/stunshells{
pixel_x = 1;
pixel_y = 15
},
@@ -3736,7 +3736,7 @@
/obj/item/reagent_containers/food/snacks/koisbar,
/obj/item/reagent_containers/food/snacks/koisbar,
/obj/item/reagent_containers/food/snacks/koisbar,
/obj/item/storage/box/monkeycubes/neaeracubes,
/obj/item/storage/box/unique/monkeycubes/neaeracubes,
/turf/simulated/floor/plating,
/area/racers)
"scQ" = (
@@ -478,7 +478,7 @@
/area/hegemony_waypoint/atmos)
"lO" = (
/obj/structure/table/reinforced/steel,
/obj/item/storage/box/donkpockets{
/obj/item/storage/box/unique/donkpockets{
pixel_y = 9;
pixel_x = 1
},
@@ -515,7 +515,7 @@
/obj/item/reagent_containers/food/snacks/fish/fishfillet,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/dark/full/airless,
/area/hegemony_waypoint/kitchen)
"mo" = (
@@ -2471,7 +2471,7 @@
/obj/random/dirt_75,
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/blood/drip,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = -7
},
/obj/item/reagent_containers/food/snacks/fish/fishfillet{
@@ -2930,7 +2930,7 @@
/obj/item/reagent_containers/food/snacks/fish/fishfillet,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/vkrexi_swollen_organ,
/turf/simulated/floor/carpet/rubber,
/area/hegemony_waypoint/kitchen)
+2 -2
View File
@@ -1470,8 +1470,8 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate/old,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/turf/simulated/floor/plating,
/area/hideout)
"va" = (
+1 -1
View File
@@ -331,7 +331,7 @@
"kL" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/gun/projectile/shotgun/pump/combat/sol,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shells/buckshot,
/obj/effect/floor_decal/corner_wide/dark_blue{
dir = 9
},
@@ -2012,7 +2012,7 @@
/area/peoples_station/barracks)
"hc" = (
/obj/structure/closet/secure_closet/kitchen_cabinet/standard,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -8463,8 +8463,8 @@
dir = 5
},
/obj/structure/table/standard,
/obj/item/storage/box/monkeycubes/stokcubes,
/obj/item/storage/box/monkeycubes/stokcubes,
/obj/item/storage/box/unique/monkeycubes/stokcubes,
/obj/item/storage/box/unique/monkeycubes/stokcubes,
/obj/item/paper/fluff/ihss_reclamation_cell{
pixel_x = 6;
pixel_y = 4
@@ -10192,7 +10192,7 @@
/turf/simulated/floor/plating,
/area/tret_industrial/inside/engineering)
"nvo" = (
/obj/item/storage/box/dynamite{
/obj/item/storage/box/unique/dynamite{
pixel_x = 4;
pixel_y = 5
},
@@ -1545,7 +1545,7 @@
dir = 1
},
/obj/item/trash/uselessplastic,
/obj/item/storage/box/anti_photons,
/obj/item/storage/box/tactical/anti_photons,
/turf/simulated/floor/tiled/steel/airless,
/area/wrecked_nt_ship)
"JI" = (
@@ -238,7 +238,7 @@
/area/cryo_outpost/inside/habitation_west)
"aoj" = (
/obj/effect/floor_decal/corner/blue/diagonal,
/obj/item/storage/box/smokes{
/obj/item/storage/box/tactical/smokes{
pixel_x = -4;
pixel_y = -5
},
@@ -2332,7 +2332,7 @@
"cBq" = (
/obj/structure/closet/crate/freezer,
/obj/effect/floor_decal/industrial/outline/research,
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/dark,
/area/cryo_outpost/inside/labs_cryo_n)
"cBJ" = (
@@ -3461,7 +3461,7 @@
"dPk" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = 3
},
/turf/simulated/floor/tiled/white,
@@ -3675,7 +3675,7 @@
/area/cryo_outpost/inside/engineering)
"eeS" = (
/obj/effect/floor_decal/industrial/outline/research,
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/dark,
/area/cryo_outpost/inside/labs_cryo_s)
"egh" = (
@@ -4956,7 +4956,7 @@
/area/cryo_outpost/inside/security)
"fww" = (
/obj/effect/floor_decal/industrial/outline/research,
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/dark,
/area/cryo_outpost/inside/labs_cryo_n)
"fwA" = (
@@ -5019,7 +5019,7 @@
"fxU" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner_wide/green/diagonal,
/obj/item/storage/box/freezer/organcooler{
/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -3;
pixel_y = 4
},
@@ -6296,7 +6296,7 @@
"hbb" = (
/obj/structure/closet/crate/freezer,
/obj/effect/floor_decal/corner_wide/green/diagonal,
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/white,
/area/cryo_outpost/inside/labs_surgery)
"hbh" = (
@@ -8925,7 +8925,7 @@
"kby" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner/pink,
/obj/item/storage/box/freezer/organcooler{
/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = 4;
pixel_y = -5
},
@@ -10746,11 +10746,11 @@
/area/cryo_outpost/inside/labs_maint_w)
"lYa" = (
/obj/structure/closet/secure_closet/freezer,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/freezer{
name = "cold storage tiles";
temperature = 278
@@ -14645,7 +14645,7 @@
/area/cryo_outpost/inside/habitation_west)
"qxH" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/obj/random/dirt_75,
/turf/simulated/floor/tiled/freezer{
name = "cold storage tiles";
@@ -16189,7 +16189,7 @@
"sif" = (
/obj/effect/floor_decal/corner_wide/green/diagonal,
/obj/structure/table/standard,
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_y = 4
},
/obj/machinery/light{
@@ -16377,7 +16377,7 @@
/obj/effect/floor_decal/industrial/outline_straight/red{
dir = 8
},
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/freezer{
name = "cold storage tiles";
temperature = 278
@@ -16519,7 +16519,7 @@
pixel_y = 12
},
/obj/effect/floor_decal/corner_wide/green/diagonal,
/obj/item/storage/box/freezer/organcooler{
/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 3
},
@@ -17397,7 +17397,7 @@
/area/cryo_outpost/inside/engineering)
"txZ" = (
/obj/structure/table/standard,
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_x = -3;
pixel_y = 3
},
@@ -17910,7 +17910,7 @@
/area/cryo_outpost/inside/labs_maint_w)
"uaK" = (
/obj/structure/table/standard,
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_x = -3;
pixel_y = -7
},
@@ -18862,7 +18862,7 @@
/area/cryo_outpost/inside/engineering)
"vcc" = (
/obj/structure/table/reinforced/steel,
/obj/item/storage/box/monkeycubes{
/obj/item/storage/box/unique/monkeycubes{
pixel_x = 3;
pixel_y = 7
},
@@ -19784,7 +19784,7 @@
"weW" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner_wide/green/diagonal,
/obj/item/storage/box/freezer/organcooler{
/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = 3;
pixel_y = 5
},
@@ -20409,7 +20409,7 @@
/area/cryo_outpost/outside/surface)
"wRv" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/obj/machinery/light/small/broken{
dir = 4
},
@@ -97,7 +97,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,
@@ -5370,10 +5370,10 @@
/area/enviro_testing_facility/inside/maintenance/control)
"rX" = (
/obj/structure/closet/crate/freezer,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/industrial/outline/service,
/turf/simulated/floor/plating,
/area/enviro_testing_facility/inside/maintenance/center_east)
@@ -939,7 +939,7 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
/obj/item/storage/box/monkeycubes,
/obj/item/storage/box/unique/monkeycubes,
/obj/structure/table/steel,
/obj/machinery/light{
dir = 8
@@ -3081,11 +3081,11 @@
req_access = null;
name = "ammunition cabinet"
},
/obj/item/storage/box/haywireshells,
/obj/item/storage/box/haywireshells,
/obj/item/storage/box/flashshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/stunshells,
/obj/item/storage/box/shells/haywireshells,
/obj/item/storage/box/shells/haywireshells,
/obj/item/storage/box/shells/flashshells,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/stunshells,
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/dark,
/area/enviro_testing_facility/inside/security/storage)
@@ -3540,7 +3540,7 @@
},
/area/template_noop)
"dvB" = (
/obj/item/storage/box/freezer/organcooler{
/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = 5;
pixel_y = -4
},
@@ -5288,10 +5288,10 @@
"fqV" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/security,
/obj/item/storage/box/smokebombs{
/obj/item/storage/box/tactical/smokebombs{
pixel_y = 5
},
/obj/item/storage/box/teargas,
/obj/item/storage/box/tactical/teargas,
/turf/simulated/floor/tiled,
/area/enviro_testing_facility/inside/security/equipment)
"frP" = (
@@ -5772,7 +5772,7 @@
/obj/effect/floor_decal/corner/green{
dir = 10
},
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_x = -3;
pixel_y = 9
},
@@ -6514,11 +6514,11 @@
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/map_effect/marker/mapmanip/submap/extract/enviro_testing_facility/misc/armory,
/obj/item/storage/box/emps{
/obj/item/storage/box/tactical/emps{
pixel_x = -3;
pixel_y = 6
},
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/tactical/smokebombs,
/turf/template_noop,
/area/template_noop)
"gwR" = (
@@ -7309,10 +7309,10 @@
/obj/structure/table/rack,
/obj/effect/floor_decal/corner/dark_blue/diagonal,
/obj/effect/floor_decal/industrial/outline/security,
/obj/item/storage/box/smokebombs{
/obj/item/storage/box/tactical/smokebombs{
pixel_y = 5
},
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/tactical/flashbangs,
/turf/simulated/floor/tiled,
/area/enviro_testing_facility/inside/security/equipment)
"hnr" = (
@@ -9240,11 +9240,11 @@
"jga" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/storage/box/emps{
/obj/item/storage/box/tactical/emps{
pixel_x = -3;
pixel_y = 6
},
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/tactical/smokebombs,
/turf/template_noop,
/area/template_noop)
"jge" = (
@@ -10038,7 +10038,7 @@
"kay" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner_wide/paleblue/diagonal,
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_x = 4;
pixel_y = -1
},
@@ -10317,7 +10317,7 @@
/area/enviro_testing_facility/inside/crew/quarters)
"kqo" = (
/obj/structure/table/rack,
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/tactical/smokebombs,
/turf/template_noop,
/area/template_noop)
"kqT" = (
@@ -10453,7 +10453,7 @@
/area/enviro_testing_facility/inside/security/hallway)
"kuh" = (
/obj/structure/table/stone/marble,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 6;
pixel_y = 6
},
@@ -11563,7 +11563,7 @@
/obj/machinery/light{
dir = 4
},
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_x = -4;
pixel_y = 4
},
@@ -12911,14 +12911,14 @@
/area/enviro_testing_facility/inside/engineering/reactors)
"nbn" = (
/obj/structure/closet/secure_closet/freezer,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/freezer,
/area/enviro_testing_facility/inside/crew/canteen)
"nbt" = (
@@ -13138,11 +13138,11 @@
"nnS" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/storage/box/frags{
/obj/item/storage/box/tactical/frags{
pixel_x = -3;
pixel_y = 6
},
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/tactical/smokebombs,
/turf/template_noop,
/area/template_noop)
"nol" = (
@@ -20936,15 +20936,15 @@
/area/enviro_testing_facility/inside/security/lobby)
"vhv" = (
/obj/structure/closet/secure_closet/freezer,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/machinery/light{
dir = 4
},
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/white,
/area/enviro_testing_facility/inside/crew/canteen)
"vhB" = (
@@ -196,7 +196,7 @@
pixel_y = -1;
pixel_x = 9
},
/obj/item/storage/box/tea{
/obj/item/storage/box/unique/tea{
pixel_x = 10;
pixel_y = 12
},
@@ -1612,8 +1612,8 @@
dir = 6
},
/obj/structure/table/standard,
/obj/item/storage/box/monkeycubes,
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/monkeycubes,
/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/white,
/area/nuclear_silo/lower_level/medbay)
"dG" = (
@@ -9316,7 +9316,7 @@
/area/nuclear_silo/lower_level/civilian/janitor)
"uI" = (
/obj/structure/table/standard,
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_x = -3;
pixel_y = -7
},
@@ -15468,7 +15468,7 @@
"Im" = (
/obj/random/dirt_75,
/obj/structure/table/wood,
/obj/item/storage/box/tea/tieguanyin{
/obj/item/storage/box/unique/tea/tieguanyin{
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup{
@@ -16535,7 +16535,7 @@
/area/nuclear_silo/lower_level/civilian/messhall)
"KF" = (
/obj/structure/closet/secure_closet/freezer/meat,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/storage/box/fancy/egg_box,
@@ -19565,7 +19565,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/random/dirt_75,
/obj/random/kitchen_staples,
/obj/random/kitchen_staples,
@@ -20197,7 +20197,7 @@
"SP" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = -3
},
/obj/structure/cable/green{
@@ -21696,8 +21696,8 @@
"Wf" = (
/obj/structure/closet/crate/freezer,
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat/chicken,
@@ -22022,7 +22022,7 @@
name = "Messhall Shutters";
req_one_access = list(248,247)
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = 9
},
/obj/random/dirt_75,
@@ -475,10 +475,10 @@
req_access = list(247)
},
/obj/effect/floor_decal/industrial/hatch/red,
/obj/item/storage/box/frags,
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/teargas,
/obj/item/storage/box/tactical/frags,
/obj/item/storage/box/tactical/smokebombs,
/obj/item/storage/box/tactical/flashbangs,
/obj/item/storage/box/tactical/teargas,
/obj/effect/map_effect/marker/mapmanip/submap/extract/nuclear_silo/armoury,
/turf/simulated/floor/tiled/dark,
/area/template_noop)
@@ -792,10 +792,10 @@
req_access = list(247)
},
/obj/effect/floor_decal/industrial/hatch/red,
/obj/item/storage/box/frags,
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/teargas,
/obj/item/storage/box/tactical/frags,
/obj/item/storage/box/tactical/smokebombs,
/obj/item/storage/box/tactical/flashbangs,
/obj/item/storage/box/tactical/teargas,
/obj/item/recharger_backpack,
/obj/item/recharger_backpack,
/obj/item/recharger_backpack,
@@ -1228,9 +1228,9 @@
/obj/item/ammo_magazine/c45m/rubber,
/obj/item/ammo_magazine/c45m/rubber,
/obj/item/ammo_magazine/c45m/rubber,
/obj/item/storage/box/stunshells,
/obj/item/storage/box/flashshells,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/shells/stunshells,
/obj/item/storage/box/shells/flashshells,
/obj/item/storage/box/shells/beanbags,
/turf/simulated/floor/tiled/dark,
/area/template_noop)
"we" = (
@@ -1804,8 +1804,8 @@
/obj/item/ammo_magazine/a556/carbine,
/obj/item/ammo_magazine/a556/carbine,
/obj/item/ammo_magazine/a556/carbine,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/turf/simulated/floor/tiled/dark,
/area/template_noop)
"FB" = (
@@ -2233,9 +2233,9 @@
req_access = list(247)
},
/obj/effect/floor_decal/industrial/hatch/red,
/obj/item/storage/box/teargas,
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/tactical/teargas,
/obj/item/storage/box/tactical/smokebombs,
/obj/item/storage/box/tactical/flashbangs,
/obj/effect/map_effect/marker/mapmanip/submap/extract/nuclear_silo/armoury,
/turf/simulated/floor/tiled/dark,
/area/template_noop)
@@ -1442,8 +1442,8 @@
"fa" = (
/obj/effect/floor_decal/industrial/outline/service,
/obj/structure/closet/secure_closet/refrigerator,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme,
@@ -2734,7 +2734,7 @@
/area/tcaf_corvette/autocannon)
"jT" = (
/obj/structure/table/stone/marble,
/obj/item/storage/box/condiment{
/obj/item/storage/box/large/condiment{
pixel_y = 14
},
/obj/item/reagent_containers/spray/cleaner{
@@ -3751,7 +3751,7 @@
/obj/item/storage/firstaid/surgery{
pixel_y = 10
},
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_y = 2;
pixel_x = 6
},
@@ -4429,7 +4429,7 @@
req_access = list(204)
},
/obj/effect/floor_decal/industrial/outline/security,
/obj/item/storage/box/frags,
/obj/item/storage/box/tactical/frags,
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/energy/blaster/revolver,
@@ -4437,10 +4437,10 @@
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/storage/box/shotgunammo,
/obj/item/storage/box/shotgunammo,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/shells/slugs,
/obj/item/storage/box/shells/slugs,
/obj/item/storage/box/shells/beanbags,
/obj/item/storage/box/shells/beanbags,
/obj/item/gun/energy/rifle/laser/noctiluca,
/obj/item/gun/energy/blaster/tcaf,
/obj/item/gun/energy/blaster/tcaf,
@@ -7102,8 +7102,8 @@
/obj/item/device/flashlight/maglight,
/obj/item/device/flashlight/maglight,
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/tactical/flashbangs,
/obj/item/storage/box/tactical/smokebombs,
/obj/item/shield/riot/tact/legion,
/obj/item/shield/riot/tact/legion,
/obj/item/shield/riot/tact/legion,
@@ -8054,7 +8054,7 @@
/obj/item/material/stool/chair/wheelchair,
/obj/item/cane/crutch,
/obj/item/cane/crutch,
/obj/item/storage/box/monkeycubes,
/obj/item/storage/box/unique/monkeycubes,
/obj/item/storage/box/autoinjectors,
/obj/item/storage/box/inhalers_auto,
/obj/item/storage/box/syringes,
@@ -10505,7 +10505,7 @@
/obj/item/storage/firstaid/surgery{
pixel_y = 13
},
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_y = 3;
pixel_x = 6
},
@@ -2537,7 +2537,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -2662,7 +2662,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/tactical/flashbangs,
/obj/item/storage/belt/security,
/turf/simulated/floor/shuttle/tan,
/area/ship/tcfl_peacekeeper_ship)
@@ -2676,7 +2676,7 @@
/obj/item/storage/box/zipties,
/obj/item/device/flash,
/obj/item/reagent_containers/spray/pepper,
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/tactical/smokebombs,
/obj/item/storage/belt/security,
/turf/simulated/floor/shuttle/tan,
/area/ship/tcfl_peacekeeper_ship)
+2 -2
View File
@@ -1186,11 +1186,11 @@
/area/casino/casino_security)
"dB" = (
/obj/structure/table/rack,
/obj/item/storage/box/beanbags{
/obj/item/storage/box/shells/beanbags{
pixel_x = -4;
pixel_y = 4
},
/obj/item/storage/box/beanbags{
/obj/item/storage/box/shells/beanbags{
pixel_x = 5;
pixel_y = -6
},
+4 -4
View File
@@ -3661,7 +3661,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -5382,9 +5382,9 @@
/obj/item/ammo_magazine/c762,
/obj/item/ammo_magazine/c762,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/flashshells,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/flashshells,
/obj/item/storage/box/shells/beanbags,
/obj/item/gun/projectile/automatic/tommygun,
/obj/item/ammo_magazine/submachinemag,
/obj/item/ammo_magazine/submachinemag,
@@ -790,11 +790,11 @@
/obj/item/reagent_containers/food/drinks/cans/beetle_milk,
/obj/item/reagent_containers/food/drinks/cans/beetle_milk,
/obj/item/reagent_containers/food/drinks/cans/beetle_milk,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -8154,9 +8154,9 @@
must_start_working = 1
},
/obj/item/gun/projectile/shotgun/pump,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/stunshells,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/stunshells,
/obj/item/gun/projectile/gauss,
/obj/item/ammo_magazine/gauss,
/obj/item/ammo_magazine/gauss,
@@ -2218,7 +2218,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -3005,10 +3005,10 @@
/obj/structure/closet/cabinet,
/obj/item/gun/energy/plasmacutter,
/obj/item/gun/projectile/shotgun/pump/combat,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/item/clothing/head/softcap/himeo,
/obj/item/clothing/accessory/badge/passcard/himeo,
/obj/item/flame/lighter/zippo/himeo,
@@ -3387,8 +3387,8 @@
/obj/item/clothing/head/helmet/space/void/mining/himeo,
/obj/item/pickaxe/diamonddrill,
/obj/item/gun/projectile/shotgun/doublebarrel,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/item/device/gps,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/light{
@@ -4008,8 +4008,8 @@
/obj/item/clothing/head/helmet/space/void/mining/himeo,
/obj/item/pickaxe/diamonddrill,
/obj/item/gun/projectile/shotgun/doublebarrel,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/item/device/gps,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/device/suit_cooling_unit,
@@ -2091,10 +2091,10 @@
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = 6
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = 6
},
/obj/item/reagent_containers/food/snacks/meat/biogenerated,
@@ -4392,10 +4392,10 @@
dir = 1;
level = 2
},
/obj/item/storage/box/condiment{
/obj/item/storage/box/large/condiment{
pixel_y = 2
},
/obj/item/storage/box/condimentbottles{
/obj/item/storage/box/large/condimentbottles{
pixel_y = 5
},
/obj/random/dirt_75,
@@ -6258,7 +6258,7 @@
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/box/tea/tieguanyin{
/obj/item/storage/box/unique/tea/tieguanyin{
desc = "A tin bearing the logo of a Dominian tea company located on Sun Reach. This one contains a bag of tieguanyin, a type of oolong tea.";
pixel_x = 14;
pixel_y = 3
@@ -7089,8 +7089,8 @@
"nhX" = (
/obj/effect/floor_decal/industrial/outline/service,
/obj/structure/closet/secure_closet/refrigerator,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme,
@@ -7721,7 +7721,7 @@
pixel_y = -14;
pixel_x = 10
},
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_x = -6;
pixel_y = -14
},
@@ -2580,7 +2580,7 @@
pixel_x = 6;
pixel_y = 2
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 2;
pixel_y = 9
},
@@ -4925,7 +4925,7 @@
/area/ship/dominian_science_vessel/hangar)
"oBB" = (
/obj/item/storage/belt/archaeology,
/obj/item/storage/box/excavation,
/obj/item/storage/box/unique/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
@@ -8057,7 +8057,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -30,7 +30,7 @@
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/storage/box/donkpockets = 1,
/obj/item/storage/box/unique/donkpockets = 1,
/obj/item/device/versebook/tribunal = 1,
/obj/item/shield/energy/dominia = 1
)
@@ -2214,7 +2214,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/item/storage/box/condiment{
/obj/item/storage/box/large/condiment{
pixel_y = 4
},
/obj/random/dirt_75,
@@ -2861,8 +2861,8 @@
"sY" = (
/obj/effect/floor_decal/industrial/outline/service,
/obj/structure/closet/secure_closet/refrigerator,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme,
@@ -3951,8 +3951,8 @@
/obj/item/ammo_magazine/c762/dpra,
/obj/item/ammo_magazine/c762/dpra,
/obj/item/gun/projectile/shotgun/foldable,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/effect/floor_decal/industrial/outline/red,
/obj/machinery/light/colored/decayed{
dir = 1
@@ -2098,7 +2098,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/drinks/carton/milk,
@@ -8977,7 +8977,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/item/storage/box/sharps{
/obj/item/storage/box/unique/sharps{
pixel_x = 8
},
/obj/item/reagent_containers/spray/cleaner{
@@ -4687,7 +4687,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -7847,7 +7847,7 @@
pixel_x = 10;
pixel_y = -2
},
/obj/item/storage/box/condiment{
/obj/item/storage/box/large/condiment{
pixel_y = 16;
pixel_x = 3
},
@@ -8537,7 +8537,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -1799,7 +1799,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -2011,7 +2011,7 @@
/obj/structure/closet/crate/miningcart,
/obj/item/reagent_containers/food/snacks/tastybread,
/obj/item/reagent_containers/food/snacks/tastybread,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/corner/dark_blue/full{
dir = 8
},
@@ -2152,7 +2152,7 @@
pixel_x = -5
},
/obj/item/reagent_containers/inhaler/space_drugs,
/obj/item/storage/box/condiment{
/obj/item/storage/box/large/condiment{
pixel_y = 16
},
/turf/simulated/floor/tiled/white,
+8 -8
View File
@@ -105,10 +105,10 @@
/obj/item/storage/belt/security/full/alt,
/obj/item/device/flashlight/maglight,
/obj/item/device/flashlight/maglight,
/obj/item/storage/box/smokebombs,
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/tactical/smokebombs,
/obj/item/storage/box/tactical/flashbangs,
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/teargas,
/obj/item/storage/box/tactical/teargas,
/obj/machinery/light/small,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/storage/box/landmines/claymore,
@@ -9835,11 +9835,11 @@
},
/obj/item/gun/energy/rifle/laser,
/obj/item/gun/projectile/shotgun/pump/combat,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/haywireshells,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/beanbags,
/obj/item/storage/box/shells/beanbags,
/obj/item/storage/box/shells/haywireshells,
/obj/item/melee/energy/glaive,
/obj/item/melee/energy/glaive,
/obj/machinery/button/remote/blast_door{
@@ -315,7 +315,7 @@
/obj/item/device/measuring_tape,
/obj/item/device/core_sampler,
/obj/item/device/depth_scanner,
/obj/item/storage/box/excavation,
/obj/item/storage/box/unique/excavation,
/obj/item/book/manual/excavation,
/obj/item/pickaxe/hand,
/obj/random/dirt_75,
@@ -792,10 +792,10 @@
/obj/item/gun/energy/net{
pixel_y = -4
},
/obj/item/storage/box/tranquilizer{
/obj/item/storage/box/shells/tranquilizer{
pixel_y = 14
},
/obj/item/storage/box/tranquilizer{
/obj/item/storage/box/shells/tranquilizer{
pixel_y = 14
},
/obj/item/gun/projectile/heavysniper/tranq{
@@ -1686,11 +1686,11 @@
pixel_x = 6;
pixel_y = 10
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 7
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 1
},
@@ -8928,10 +8928,10 @@
name = "wall cabinet";
pixel_x = -32
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = -3
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = 6
},
/obj/item/storage/box/fancy/egg_box{
@@ -80,7 +80,7 @@
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/storage/box/donkpockets = 1
/obj/item/storage/box/unique/donkpockets = 1
)
/obj/outfit/admin/izweski/get_id_access()
@@ -123,7 +123,7 @@
uniform = /obj/item/clothing/under/unathi/skakh/warrior
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/storage/box/donkpockets = 1,
/obj/item/storage/box/unique/donkpockets = 1,
/obj/item/device/versebook/skakh = 1
)
@@ -2179,9 +2179,9 @@
/obj/machinery/light{
dir = 1
},
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/turf/simulated/floor/lino/diamond,
/area/miners_guild/canteen)
"qD" = (
+1 -1
View File
@@ -1483,7 +1483,7 @@
/obj/machinery/light{
dir = 4
},
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
@@ -663,8 +663,8 @@
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
/obj/item/storage/box/produce,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/freezer{
name = "cooled tiles";
temperature = 253.15
@@ -1572,9 +1572,9 @@
/obj/machinery/light,
/obj/item/clothing/accessory/storage/bandolier,
/obj/item/clothing/accessory/storage/bandolier,
/obj/item/storage/box/shotgunammo,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shells/slugs,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/item/ammo_magazine/mc9mmt,
/obj/item/ammo_magazine/mc9mmt,
/obj/item/ammo_magazine/mc9mmt,
@@ -4216,7 +4216,7 @@
/obj/item/shield/energy,
/obj/item/shield/energy,
/obj/item/shield/energy,
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/tactical/flashbangs,
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/handcuffs,
/obj/item/gun/energy/disruptorpistol,
+1 -1
View File
@@ -8634,7 +8634,7 @@
/obj/structure/closet/secure_closet/refrigerator,
/obj/random/kitchen_staples,
/obj/random/kitchen_staples,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/light,
/area/himeo_patrol_ship/messhall)
+9 -9
View File
@@ -1148,7 +1148,7 @@
/obj/effect/floor_decal/corner_wide/paleblue{
dir = 10
},
/obj/item/storage/box/sharps,
/obj/item/storage/box/unique/sharps,
/obj/structure/table/reinforced/glass,
/turf/simulated/floor/tiled/white,
/area/ship/iac_rescue_ship/surgery)
@@ -1650,13 +1650,13 @@
},
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/beanbags{
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/shells/beanbags{
pixel_x = -4;
pixel_y = 4
},
/obj/item/storage/box/beanbags{
/obj/item/storage/box/shells/beanbags{
pixel_x = -4;
pixel_y = 4
},
@@ -2171,7 +2171,7 @@
/area/ship/iac_rescue_ship/bridge)
"emR" = (
/obj/structure/table/stone/marble,
/obj/item/storage/box/condiment{
/obj/item/storage/box/large/condiment{
pixel_y = 10;
pixel_x = 2
},
@@ -7441,7 +7441,7 @@
icon_state = "sterilesprayblue";
name = "surgery cleaner"
},
/obj/item/storage/box/freezer/organcooler,
/obj/item/storage/box/unique/freezer/organcooler,
/obj/structure/table/reinforced/glass,
/turf/simulated/floor/tiled/white,
/area/ship/iac_rescue_ship/surgery)
@@ -9783,10 +9783,10 @@
/area/space)
"xeu" = (
/obj/structure/table/stone/marble,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = 9
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = 3
},
/obj/item/material/kitchen/rollingpin{
+4 -4
View File
@@ -4106,7 +4106,7 @@
"pl" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/dark_green/diagonal,
/obj/item/storage/box/condiment{
/obj/item/storage/box/large/condiment{
pixel_y = 10;
pixel_x = 2
},
@@ -5628,10 +5628,10 @@
"ue" = (
/obj/effect/floor_decal/corner/dark_green/diagonal,
/obj/structure/table/stone/marble,
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = 9
},
/obj/item/storage/box/produce{
/obj/item/storage/box/large/produce{
pixel_y = 3
},
/obj/item/material/kitchen/rollingpin{
@@ -7226,7 +7226,7 @@
req_one_access = list(220)
},
/obj/structure/table/reinforced/steel,
/obj/item/storage/box/flashbangs{
/obj/item/storage/box/tactical/flashbangs{
pixel_y = 7;
pixel_x = 7
},
@@ -4285,13 +4285,13 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/storage/box/produce,
/obj/item/storage/box/condiment,
/obj/item/storage/box/large/produce,
/obj/item/storage/box/large/condiment,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/effect/floor_decal/corner_wide/grey/diagonal,
/obj/item/storage/box/produce,
/obj/item/storage/box/large/produce,
/obj/machinery/light,
/turf/simulated/floor/tiled/white,
/area/kataphract_chapter/mess)
@@ -82,7 +82,7 @@
l_ear = /obj/item/device/radio/headset/ship
backpack_contents = list(
/obj/item/storage/box/donkpockets = 1
/obj/item/storage/box/unique/donkpockets = 1
)
/obj/outfit/admin/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)

Some files were not shown because too many files have changed in this diff Show More