cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] New closets [MDB IGNORE] (#25167)

Browse Source 
* New closets

* Grammar checks every closet that spawns on a station. (#73331)

All closets now are called either closets, lockers, wardrobes etc. (e.g.
the lethal injections locker was previously called "lethal injections")
Head of staff and the cook's locker are no longer proper nouns, it
didn't make much grammatical sense and it keeps consistency with other
lockers (Example: detective's cabinet)
All locker names de-capitalized except the Thunderdome ones since those
made sense.
The empty freezer is now just called a freezer since it being empty or
not depends on what players and mappers do to it.
Tram now has evidence lockers labelled from 1 through 7 instead of 7
evidence lockers labelled as 1.

Changes have been made to all station maps and in code, I've not gone
through all ruins, away missions, etc.

Cleans up a lot  of minor name issues.
🆑
spellcheck: All station closet and lockers have had their naming
conventions standardized.
fix: Tram now has evidence lockers labelled 1 through 7 instead of 7
evidence lockers labelled as locker 1.
/🆑

* Removed Duplicates, Modularized Overrides.

* Added Base States, Removed Unused Icons

* Icon states

* Fix wall closets to not fail CI

---------

Co-authored-by: Andrew <mt.forspam@gmail.com>
Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
Co-authored-by: SomeRandomOwl <2568378+SomeRandomOwl@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-11-24 19:30:18 -05:00
committed by GitHub
co-authored by Andrew NamelessFairy SomeRandomOwl
parent 3af55486ae
commit df23153c79
20 changed files with 71 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+10 -4
View File
@@ -26,13 +26,13 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
/// Whether or not this door is being animated
var/is_animating_door = FALSE
/// Vertical squish of the door
var/door_anim_squish = 0.12
var/door_anim_squish = 0.2
/// The maximum angle the door will be drawn at
var/door_anim_angle = 136
/// X position of the closet door hinge
var/door_anim_angle = 140
/// X position of the closet door hinge, relative to the center of the sprite
var/door_hinge_x = -6.5
/// Amount of time it takes for the door animation to play
var/door_anim_time = 1.5 // set to 0 to make the door not animate at all
var/door_anim_time = 2 // set to 0 to make the door not animate at all
/// Paint jobs for this closet, crates are a subtype of closet so they override these values
var/list/paint_jobs = TRUE
/// Controls whether a door overlay should be applied using the icon_door value as the icon state
@@ -65,6 +65,7 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
var/delivery_icon = "deliverycloset" //which icon to use when packagewrapped. null to be unwrappable.
var/anchorable = TRUE
var/icon_welded = "welded"
var/icon_broken = "sparking"
/// Whether a skittish person can dive inside this closet. Disable if opening the closet causes "bad things" to happen or that it leads to a logical inconsistency.
var/divable = TRUE
/// true whenever someone with the strong pull component (or magnet modsuit module) is dragging this, preventing opening
@@ -199,6 +200,11 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
if(welded)
. += icon_welded
if(broken && secure)
. += mutable_appearance(icon, icon_broken, alpha = alpha)
. += emissive_appearance(icon, icon_broken, src, alpha = alpha)
return
if(broken || !secure)
return
//Overlay is similar enough for both that we can use the same mask for both
code/game/objects/structures/crates_lockers/closets/fitness.dm
+4 -1
View File
@@ -15,8 +15,9 @@
/obj/structure/closet/boxinggloves
name = "boxing gloves"
name = "boxing gloves closet"
desc = "It's a storage unit for gloves for use in the boxing ring."
icon_door = "mixed"
/obj/structure/closet/boxinggloves/PopulateContents()
..()
@@ -41,6 +42,7 @@
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_door = "red"
icon_state = "rack"
/obj/structure/closet/lasertag/red/PopulateContents()
..()
@@ -55,6 +57,7 @@
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_door = "blue"
icon_state = "rack"
/obj/structure/closet/lasertag/blue/PopulateContents()
..()
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+17 -16
View File
@@ -3,7 +3,7 @@
/obj/structure/closet/gmcloset
name = "formal closet"
desc = "It's a storage unit for formal clothing."
icon_door = "black"
icon_door = "bar_wardrobe"
/obj/structure/closet/gmcloset/PopulateContents()
..()
@@ -24,9 +24,9 @@
generate_items_inside(items_inside,src)
/obj/structure/closet/chefcloset
name = "\proper chef's closet"
name = "chef's closet"
desc = "It's a storage unit for foodservice garments and mouse traps."
icon_door = "black"
icon_door = "chef_wardrobe"
/obj/structure/closet/chefcloset/PopulateContents()
..()
@@ -47,7 +47,7 @@
/obj/structure/closet/jcloset
name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear."
icon_door = "mixed"
icon_door = "jani_wardrobe"
/obj/structure/closet/jcloset/PopulateContents()
..()
@@ -75,7 +75,7 @@
/obj/structure/closet/lawcloset
name = "legal closet"
desc = "It's a storage unit for courtroom apparel and items."
icon_door = "blue"
icon_door = "law_wardrobe"
/obj/structure/closet/lawcloset/PopulateContents()
..()
@@ -102,7 +102,7 @@
/obj/structure/closet/wardrobe/chaplain_black
name = "chapel wardrobe"
desc = "It's a storage unit for Nanotrasen-approved religious attire."
icon_door = "black"
icon_door = "chap_wardrobe"
/obj/structure/closet/wardrobe/chaplain_black/PopulateContents()
new /obj/item/choice_beacon/holy(src)
@@ -120,7 +120,7 @@
/obj/structure/closet/wardrobe/red
name = "security wardrobe"
icon_door = "red"
icon_door = "sec_wardrobe"
/obj/structure/closet/wardrobe/red/PopulateContents()
var/static/items_inside = list(
@@ -140,7 +140,7 @@
/obj/structure/closet/wardrobe/cargotech
name = "cargo wardrobe"
icon_door = "orange"
icon_door = "cargo_wardrobe"
/obj/structure/closet/wardrobe/cargotech/PopulateContents()
var/static/items_inside = list(
@@ -172,7 +172,7 @@
/obj/structure/closet/wardrobe/engineering_yellow
name = "engineering wardrobe"
icon_door = "yellow"
icon_door = "engi_wardrobe"
/obj/structure/closet/wardrobe/engineering_yellow/PopulateContents()
var/static/items_inside = list(
@@ -191,6 +191,7 @@
/obj/structure/closet/wardrobe/white/medical
name = "medical doctor's wardrobe"
icon_door = "med_wardrobe"
/obj/structure/closet/wardrobe/white/medical/PopulateContents()
var/static/items_inside = list(
@@ -213,7 +214,7 @@
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
icon_door = "black"
icon_door = "robo_wardrobe"
/obj/structure/closet/wardrobe/robotics_black/PopulateContents()
var/static/items_inside = list(
@@ -233,7 +234,7 @@
/obj/structure/closet/wardrobe/chemistry_white
name = "chemistry wardrobe"
icon_door = "white"
icon_door = "chem_wardrobe"
/obj/structure/closet/wardrobe/chemistry_white/PopulateContents()
var/static/items_inside = list(
@@ -251,7 +252,7 @@
/obj/structure/closet/wardrobe/genetics_white
name = "genetics wardrobe"
icon_door = "white"
icon_door = "gen_wardrobe"
/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
var/static/items_inside = list(
@@ -268,7 +269,7 @@
/obj/structure/closet/wardrobe/virology_white
name = "virology wardrobe"
icon_door = "white"
icon_door = "viro_wardrobe"
/obj/structure/closet/wardrobe/virology_white/PopulateContents()
var/static/items_inside = list(
@@ -285,7 +286,7 @@
/obj/structure/closet/wardrobe/science_white
name = "science wardrobe"
icon_door = "white"
icon_door = "sci_wardrobe"
/obj/structure/closet/wardrobe/science_white/PopulateContents()
var/static/items_inside = list(
@@ -304,7 +305,7 @@
/obj/structure/closet/wardrobe/botanist
name = "botanist wardrobe"
icon_door = "green"
icon_door = "botany_wardrobe"
/obj/structure/closet/wardrobe/botanist/PopulateContents()
var/static/items_inside = list(
@@ -321,7 +322,7 @@
/obj/structure/closet/wardrobe/curator
name = "treasure hunting wardrobe"
icon_door = "black"
icon_door = "curator_wardrobe"
/obj/structure/closet/wardrobe/curator/PopulateContents()
new /obj/item/clothing/head/fedora/curator(src)
code/game/objects/structures/crates_lockers/closets/l3closet.dm
+13 -15
View File
@@ -10,9 +10,19 @@
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/oxygen(src)
/obj/structure/closet/l3closet/scientist
icon_door = "bio_sci"
/obj/structure/closet/l3closet/scientist/PopulateContents()
new /obj/item/storage/bag/xeno(src)
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/oxygen(src)
/obj/structure/closet/l3closet/virology
icon_state = "bio_viro"
icon_door = "bio_viro"
/obj/structure/closet/l3closet/virology/PopulateContents()
new /obj/item/storage/bag/bio(src)
@@ -23,7 +33,7 @@
/obj/structure/closet/l3closet/security
icon_state = "bio_sec"
icon_door = "bio_sec"
/obj/structure/closet/l3closet/security/PopulateContents()
new /obj/item/clothing/suit/bio_suit/security(src)
@@ -33,22 +43,10 @@
/obj/structure/closet/l3closet/janitor
icon_state = "bio_jan"
icon_door = "bio_jan"
/obj/structure/closet/l3closet/janitor/PopulateContents()
new /obj/item/clothing/suit/bio_suit/janitor(src)
new /obj/item/clothing/head/bio_hood/janitor(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/oxygen(src)
/obj/structure/closet/l3closet/scientist
icon_state = "bio_viro"
/obj/structure/closet/l3closet/scientist/PopulateContents()
new /obj/item/storage/bag/xeno(src)
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/oxygen(src)
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/quartermaster
name = "\proper quartermaster's locker"
name = "quartermaster's locker"
req_access = list(ACCESS_QM)
icon_state = "qm"
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/engineering_chief
name = "\proper chief engineer's locker"
name = "chief engineer's locker"
req_access = list(ACCESS_CE)
icon_state = "ce"
@@ -83,7 +83,7 @@
/obj/structure/closet/secure_closet/atmospherics
name = "\proper atmospheric technician's locker"
name = "atmospheric technician's locker"
req_access = list(ACCESS_ATMOSPHERICS)
icon_state = "atmos"
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+1 -1
View File
@@ -42,7 +42,7 @@
. = ..()
/obj/structure/closet/secure_closet/freezer/empty
name = "empty freezer"
name = "freezer"
/obj/structure/closet/secure_closet/freezer/empty/open
req_access = null
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+6 -3
View File
@@ -21,6 +21,7 @@
/obj/structure/closet/secure_closet/medical2
name = "anesthetic closet"
desc = "Used to knock people out."
icon_state = "med_secure"
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/medical2/PopulateContents()
@@ -48,6 +49,7 @@
name = "psychology locker"
req_access = list(ACCESS_PSYCHOLOGY)
icon_state = "cabinet"
door_anim_time = 0 // no animation
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
@@ -68,7 +70,7 @@
new /obj/item/clothing/glasses/blindfold(src)
/obj/structure/closet/secure_closet/chief_medical
name = "\proper chief medical officer's locker"
name = "chief medical officer's locker"
req_access = list(ACCESS_CMO)
icon_state = "cmo"
@@ -103,7 +105,8 @@
new /obj/item/storage/hypospraykit/cmo(src) //SKYRAT EDIT ADDITION - New Hyposprays
/obj/structure/closet/secure_closet/animal
name = "animal control"
name = "animal control locker"
icon_door = "chemical"
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/animal/PopulateContents()
@@ -116,7 +119,7 @@
name = "chemical closet"
desc = "Store dangerous chemicals in here."
req_access = list(ACCESS_PHARMACY)
icon_door = "chemical"
icon_state = "chem_secure"
/obj/structure/closet/secure_closet/chemical/PopulateContents()
..()
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+1
View File
@@ -44,6 +44,7 @@
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
close_sound_volume = 50
door_anim_time = 0 // no animation
/obj/structure/closet/secure_closet/personal/cabinet/PopulateContents()
new /obj/item/storage/backpack/satchel/leather/withwallet( src )
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/research_director
name = "\proper research director's locker"
name = "research director's locker"
req_access = list(ACCESS_RD)
icon_state = "rd"
code/game/objects/structures/crates_lockers/closets/secure/security.dm
Executable → Regular
+6 -5
View File
@@ -189,7 +189,7 @@
new /obj/item/clothing/head/fedora/inspector_hat(src)
/obj/structure/closet/secure_closet/injection
name = "lethal injections"
name = "lethal injections locker"
req_access = list(ACCESS_HOS)
/obj/structure/closet/secure_closet/injection/PopulateContents()
@@ -269,7 +269,7 @@
/obj/structure/closet/secure_closet/contraband/armory
anchored = TRUE
name = "Contraband Locker"
name = "contraband locker"
req_access = list(ACCESS_ARMORY)
/obj/structure/closet/secure_closet/contraband/heads
@@ -279,7 +279,6 @@
/obj/structure/closet/secure_closet/armory1
name = "armory armor locker"
icon_state = "armory" // SKYRAT EDIT ADDITION - NEW ICON ADDED IN peacekeeper_lockers.dm
req_access = list(ACCESS_ARMORY)
/obj/structure/closet/secure_closet/armory1/PopulateContents()
@@ -299,7 +298,8 @@
/obj/structure/closet/secure_closet/armory2
name = "armory ballistics locker"
icon_state = "armory" // SKYRAT EDIT ADDITION - NEW ICON ADDED IN peacekeeper_lockers.dm
icon_state = "tac"
icon_door = "armory_shotgun"
req_access = list(ACCESS_ARMORY)
/obj/structure/closet/secure_closet/armory2/PopulateContents()
@@ -312,7 +312,8 @@
/obj/structure/closet/secure_closet/armory3
name = "armory energy gun locker"
icon_state = "armory" // SKYRAT EDIT ADDITION - NEW ICON ADDED IN peacekeeper_lockers.dm
icon_state = "tac"
icon_door = "armory_energy"
req_access = list(ACCESS_ARMORY)
/obj/structure/closet/secure_closet/armory3/PopulateContents()
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
-11
View File
@@ -185,14 +185,3 @@
new /obj/item/clothing/under/color/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/head/utility/bomb_hood/white(src)
/*
* Ammunition
*/
/obj/structure/closet/ammunitionlocker
name = "ammunition locker"
/obj/structure/closet/ammunitionlocker/PopulateContents()
..()
for(var/i in 1 to 8)
new /obj/item/ammo_casing/shotgun/beanbag(src)
code/game/objects/structures/guncase.dm
-1
View File
@@ -130,7 +130,6 @@
/obj/structure/guncase/ecase
name = "energy gun locker"
desc = "A locker that holds energy guns."
icon_state = "ecase"
case_type = "egun"
gun_category = /obj/item/gun/energy/e_gun
code/modules/awaymissions/exile.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/exile
name = "exile implants"
name = "exile implants locker"
req_access = list(ACCESS_HOS)
/obj/structure/closet/secure_closet/exile/PopulateContents()
code/modules/mining/mine_items.dm
+2 -2
View File
@@ -30,7 +30,7 @@
/obj/structure/closet/wardrobe/miner
name = "mining wardrobe"
icon_door = "mixed"
icon_door = "mining_wardrobe"
/obj/structure/closet/wardrobe/miner/PopulateContents()
new /obj/item/storage/backpack/duffelbag/explorer(src)
@@ -51,7 +51,7 @@
new /obj/item/clothing/suit/hooded/wintercoat/miner(src)
/obj/structure/closet/secure_closet/miner
name = "miner's equipment"
name = "miner's equipment locker"
icon_state = "mining"
req_access = list(ACCESS_MINING)
icons/obj/storage/closet.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 45 KiB

icons/obj/storage/crates.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

modular_skyrat/master_files/icons/obj/closet.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 15 KiB

modular_skyrat/modules/advanced_shuttles/code/closet.dm
+1
View File
@@ -104,4 +104,5 @@
density = TRUE
icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
icon_state = "closet_wall"
icon_door = null
door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS
modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_lockers.dm
+5
View File
@@ -9,9 +9,14 @@
/obj/structure/closet/secure_closet/armory1
icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi'
icon_state = "armory"
/obj/structure/closet/secure_closet/armory2
icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi'
icon_state = "armory"
icon_door = null
/obj/structure/closet/secure_closet/armory3
icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi'
icon_state = "armory"
icon_door = null