cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +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/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()