cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kitchen Storage Tweaks (#18702)

Browse Source 
* Code

* Mapping

* Rename Files

* Changelog

* Changelog Tweaks

* Changelog

* DME

* Changelog Cleanup

* Commas

* Indentation

* Post-merge Fix
This commit is contained in:
SleepyGemmy
2024-03-23 17:24:11 +00:00
committed by GitHub
parent f043918e98
commit 1389b47c72
77 changed files with 254 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm → code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm
+96 -62
View File
@@ -1,9 +1,59 @@
//
// Freezer
// Refrigerators
//
// Empty Refrigerator
/obj/structure/closet/secure_closet/refrigerator
name = "refrigerator"
desc = "A white refrigerator."
icon_state = "refrigerator"
door_anim_squish = 0.22
door_anim_angle = 123
// Standard Refrigerator
/obj/structure/closet/secure_closet/refrigerator/standard/fill()
// 5 Cartons of Milk
for(var/i = 0, i < 5, i++)
new /obj/item/reagent_containers/food/drinks/carton/milk(src)
// 2 Cartons of Soy Milk
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
// 1 Egg Box
for(var/i = 0, i < 2, i++)
new /obj/item/storage/box/fancy/egg_box(src)
// 1 Stick of Butter
for(var/i = 0, i < 1, i++)
new /obj/item/reagent_containers/food/snacks/spreads/butter(src)
// 4 Random Condiments
for(var/i = 0, i < 4, i++)
new /obj/random/condiment(src)
// 2 Random Kitchen Staples
for(var/i = 0, i < 2, i++)
new /obj/random/kitchen_staples(src)
// Cafe Refrigerator
/obj/structure/closet/secure_closet/refrigerator/cafe/fill()
// 6 Cartons of Milk
for(var/i = 0, i < 6, i++)
new /obj/item/reagent_containers/food/drinks/carton/milk(src)
// 3 Egg Boxes
// 3 Bags of Flour
for(var/i = 0, i < 3, i++)
new /obj/item/storage/box/fancy/egg_box(src)
new /obj/item/reagent_containers/food/condiment/flour(src)
// 2 Cartons of Soymilk and 2 Bags of Sugar
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
//
// Freezers
//
// Empty Freezer
/obj/structure/closet/secure_closet/freezer
name = "freezer"
desc = "A freezer."
desc = "A white freezer."
icon_state = "freezer"
door_anim_squish = 0.22
door_anim_angle = 123
@@ -11,31 +61,37 @@
// Meat Freezer
/obj/structure/closet/secure_closet/freezer/meat
name = "meat freezer"
desc = "A white freezer labelled \"Meat\"."
/obj/structure/closet/secure_closet/freezer/meat/fill()
..()
for(var/i = 0, i < 8, i++)
new /obj/item/reagent_containers/food/snacks/meat(src)
/obj/structure/closet/secure_closet/freezer/meat/super_meat/fill() // This is enough meat to do 10 grill batches.
// Grilling Meat Freezer
// Enough meat to do 10 grill batches.
/obj/structure/closet/secure_closet/freezer/meat/grill/fill()
// 30 Meat
for(var/i = 0, i < 30, i++)
new /obj/item/reagent_containers/food/snacks/meat(src)
var/obj/item/reagent_containers/food/condiment/shaker/spacespice/SS = new(src)
SS.pixel_x = 6
SS.pixel_y = 12
// 1 Salt Shaker
var/obj/item/reagent_containers/food/condiment/shaker/salt/S = new(src)
S.pixel_x = 6
S.pixel_y = 10
// 1 Pepper Shaker
var/obj/item/reagent_containers/food/condiment/shaker/peppermill/P = new(src)
P.pixel_x = 6
P.pixel_y = 8
// 1 Space Spice Shaker
var/obj/item/reagent_containers/food/condiment/shaker/spacespice/SS = new(src)
SS.pixel_x = 6
SS.pixel_y = 12
// Chicken and Fish Freezer
/obj/structure/closet/secure_closet/freezer/chicken_and_fish
name = "chicken and fish freezer"
desc = "A white freezer labelled \"Chicken and Fish\"."
/obj/structure/closet/secure_closet/freezer/chicken_and_fish/fill()
..()
// 6 Chicken Fillets
for(var/i = 0, i < 6, i++)
new /obj/item/reagent_containers/food/snacks/meat/chicken(src)
@@ -43,73 +99,51 @@
for(var/i = 0, i < 6, i++)
new /obj/item/reagent_containers/food/snacks/fish/fishfillet(src)
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
desc = "A refrigerator."
// Empty Biohazard Freezer
/obj/structure/closet/secure_closet/freezer/kois
name = "biohazard freezer"
desc = "A freezer, painted in a sickly yellow, with a biohazard sign on the door."
icon_state = "freezer_biohazard"
/obj/structure/closet/secure_closet/freezer/fridge/fill()
..()
for(var/i = 0, i < 5, i++)
new /obj/item/reagent_containers/food/drinks/carton/milk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/storage/box/fancy/egg_box(src)
for(var/i = 0, i < 1, i++)
new /obj/item/reagent_containers/food/snacks/spreads/butter(src)
for(var/i = 0, i < 4, i++)
new /obj/random/condiment(src)
for(var/i = 0, i < 2, i++)
new /obj/random/kitchen_staples(src)
// K'ois Freezer
/obj/structure/closet/secure_closet/freezer/kois/spores
name = "k'ois freezer"
desc = "A freezer labelled \"K'ois\", painted in a sickly yellow, with a biohazard sign on the door. "
/obj/structure/closet/secure_closet/freezer/kitchen
/obj/structure/closet/secure_closet/freezer/kois/spores/fill()
// 8 K'ois
for(var/i = 0, i < 8, i++)
new /obj/item/reagent_containers/food/snacks/grown/kois(src)
//
// Kitchen Cabinets
//
// Empty Kitchen Cabinet
/obj/structure/closet/secure_closet/kitchen_cabinet
name = "kitchen cabinet"
desc = "A cabinet."
req_access = list(ACCESS_KITCHEN)
desc = "A white kitchen cabinet."
/obj/structure/closet/secure_closet/freezer/kitchen/fill()
// Standard Kitchen Cabinet
/obj/structure/closet/secure_closet/kitchen_cabinet/standard/fill()
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/condiment/flour(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
new /obj/item/reagent_containers/food/condiment/shaker/spacespice(src)
/obj/structure/closet/secure_closet/freezer/kitchen/mining
req_access = list()
//
// Miscellaneous
//
// Money
// Used on the Grand Romanovich.
/obj/structure/closet/secure_closet/freezer/money
name = "freezer"
desc = "This contains cold hard cash."
req_access = list(ACCESS_HEADS_VAULT)
name = "credits freezer"
desc = "This contains cold, hard credits."
/obj/structure/closet/secure_closet/freezer/money/fill()
..()
for(var/i = 0, i < rand(15,25), i++)
for(var/i = 0, i < rand(15, 25), i++)
new /obj/random/spacecash(src)
for(var/i = 0, i < rand(6,9), i++)
for(var/i = 0, i < rand(6, 9), i++)
new /obj/random/coin(src)
/obj/structure/closet/secure_closet/freezer/cafe/fill()
..()
for(var/i = 0, i < 6, i++)
new /obj/item/reagent_containers/food/drinks/carton/milk(src)
for(var/i = 0, i < 3, i++)
new /obj/item/storage/box/fancy/egg_box(src)
new /obj/item/reagent_containers/food/condiment/flour(src)
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
/obj/structure/closet/secure_closet/freezer/kois
name = "freezer"
desc = "A freezer, painted in a sickly yellow, with a biohazard sign on the door."
icon_state = "freezer_kois"
/obj/structure/closet/secure_closet/freezer/kois/spores
name = "k'ois freezer"
desc = "A freezer with k'ois inside. Painted in a sickly yellow, with a biohazard sign on the door."
/obj/structure/closet/secure_closet/freezer/kois/spores/fill()
..()
for(var/i = 0, i < 8, i++)
new /obj/item/reagent_containers/food/snacks/grown/kois(src)
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm → code/game/objects/structures/crates_lockers/closets/secure/locker.dm
+5 -37
View File
@@ -1,11 +1,11 @@
/obj/structure/closet/secure_closet
name = "secure locker"
desc = "It's an immobile card-locked storage unit."
name = "locker"
desc = "It's a steel ID-locked locker."
icon = 'icons/obj/closet.dmi'
icon_state = "secure"
anchored = FALSE
secure = TRUE
opened = FALSE
anchored = FALSE
locked = TRUE
health = 200
@@ -55,7 +55,7 @@
. = ..()
togglelock(user)
/obj/structure/closet/proc/CanChainsaw(var/obj/item/material/twohanded/chainsaw/ChainSawVar) // Wow, this is like, a real-life fossil.
/obj/structure/closet/proc/CanChainsaw(var/obj/item/material/twohanded/chainsaw/ChainSawVar)
return (ChainSawVar.powered && !opened && !broken)
/obj/structure/closet/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "")
@@ -78,7 +78,7 @@
return 1
/obj/structure/closet/proc/verb_togglelock()
set src in oview(1) // One square distance
set src in oview(1)
set category = "Object"
set name = "Toggle Lock"
@@ -89,35 +89,3 @@
togglelock(usr)
else
to_chat(usr, SPAN_WARNING("This mob type can't use this verb."))
// Marooning Equipment
/obj/structure/closet/secure_closet/marooning_equipment
name = "marooning equipment locker"
icon_state = "maroon"
req_one_access = list(ACCESS_SECURITY, ACCESS_HEADS) // Marooned personnel would likely be marooned by security and/or command.
/obj/structure/closet/secure_closet/marooning_equipment/fill()
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/shoes/workboots/grey(src)
new /obj/item/clothing/head/helmet/space/emergency/marooning_equipment(src)
new /obj/item/clothing/suit/space/emergency/marooning_equipment(src)
new /obj/item/tank/oxygen/marooning_equipment(src)
new /obj/item/storage/backpack/duffel/marooning_equipment(src)
/obj/item/storage/backpack/duffel/marooning_equipment
name = "marooning equipment duffel bag"
desc = "A duffel bag full of marooning equipment."
starts_with = list(
/obj/item/crowbar/red = 1,
/obj/item/device/flashlight/heavy = 1,
/obj/item/device/gps/marooning_equipment = 1,
/obj/item/airbubble = 1,
// Rations
/obj/item/storage/box/fancy/mre/random = 2,
/obj/item/reagent_containers/food/drinks/waterbottle = 4,
// Medical Supplies
/obj/item/storage/firstaid/stab = 1,
)
code/game/objects/structures/crates_lockers/closets/secure/marooning.dm
+34
View File
@@ -0,0 +1,34 @@
//
// Marooning Equipment
//
/obj/structure/closet/secure_closet/marooning_equipment
name = "marooning equipment locker"
icon_state = "maroon"
req_one_access = list(ACCESS_HEADS, ACCESS_SECURITY) // Marooned personnel would likely be marooned by security and/or command.
/obj/structure/closet/secure_closet/marooning_equipment/fill()
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/shoes/workboots/grey(src)
new /obj/item/clothing/head/helmet/space/emergency/marooning_equipment(src)
new /obj/item/clothing/suit/space/emergency/marooning_equipment(src)
new /obj/item/tank/oxygen/marooning_equipment(src)
new /obj/item/storage/backpack/duffel/marooning_equipment(src)
/obj/item/storage/backpack/duffel/marooning_equipment
name = "marooning equipment duffel bag"
desc = "A duffel bag full of marooning equipment."
starts_with = list(
// Tools
/obj/item/crowbar/red = 1,
/obj/item/device/flashlight/heavy = 1,
/obj/item/device/gps/marooning_equipment = 1,
/obj/item/airbubble = 1,
// Rations
/obj/item/storage/box/fancy/mre/random = 2,
/obj/item/reagent_containers/food/drinks/waterbottle = 4,
// Medical Supplies
/obj/item/storage/firstaid/stab = 1
)