cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

New boxes (#21439)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/boxes.dm
+324 -357
View File
File diff suppressed because it is too large Load Diff
code/game/objects/items/weapons/storage/fancy.dm
+1
View File
@@ -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)
. += ..()
code/game/objects/items/weapons/storage/uplink_kits.dm
+2 -1
View File
@@ -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
code/game/objects/random/loot.dm
+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,
code/game/objects/random/misc.dm
+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,
code/game/objects/random/weapon.dm
+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,
code/game/objects/structures/crates_lockers/closets/gimmick.dm
+6 -6
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -1
View File
@@ -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
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+5 -5
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+2 -2
View File
@@ -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)
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -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
code/game/objects/structures/trash_pile.dm
+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,