Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
647 changes: 394 additions & 253 deletions _maps/map_files/YogStation/YogStation.dmm

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion code/__DEFINES/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#define SEC_DEPT_MEDICAL "Medical"
#define SEC_DEPT_SCIENCE "Science"
#define SEC_DEPT_SUPPLY "Supply"
#define SEC_DEPT_SERVICE "Service"

// Playtime tracking system, see jobs_exp.dm
#define EXP_TYPE_LIVING "Living"
Expand All @@ -81,4 +82,4 @@
//Job preferences levels
#define JP_LOW 1
#define JP_MEDIUM 2
#define JP_HIGH 3
#define JP_HIGH 3
2 changes: 1 addition & 1 deletion code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ GLOBAL_LIST_INIT(ai_core_display_screens, list(
input = pick(GLOB.ai_core_display_screens - "Random")
return "ai-[lowertext(input)]"

GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))
GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY, SEC_DEPT_SERVICE))

//Backpacks
#define GBACKPACK "Grey Backpack"
Expand Down
4 changes: 4 additions & 0 deletions code/game/area/Space_Station_13_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Security Post - Research Division"
icon_state = "checkpoint_res"

/area/security/checkpoint/service
name = "Security Post - Service"
icon_state = "checkpoint_srv"

/area/security/checkpoint/customs
name = "Customs"
icon_state = "customs_point"
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/effects/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,9 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/depsec/science
name = "science_sec"

/obj/effect/landmark/start/depsec/service
name = "service_sec"

//Antagonist spawns

/obj/effect/landmark/start/wizard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,13 @@
new /obj/item/clothing/accessory/armband/medblue(src)
new /obj/item/encryptionkey/headset_med(src)

/obj/structure/closet/secure_closet/security/srv

/obj/structure/closet/secure_closet/security/srv/PopulateContents()
..()
new /obj/item/clothing/accessory/armband/service(src)
new /obj/item/encryptionkey/headset_service(src)

/obj/structure/closet/secure_closet/detective
name = "\improper detective's cabinet"
req_access = list(ACCESS_FORENSICS_LOCKERS)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/under/accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,12 @@
icon_state = "rndband"
item_color = "rndband"

/obj/item/clothing/accessory/armband/service
name = "service guard armband"
desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is green."
icon_state = "serviceband"
item_color = "serviceband"

/obj/item/clothing/accessory/armband/hydro
name = "hydroponics guard armband"
desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is green and blue."
Expand Down
12 changes: 11 additions & 1 deletion code/modules/jobs/job_types/security_officer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
L |= ..() | check_config_for_sec_maint()
return L

GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))
GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY, SEC_DEPT_SERVICE))

/datum/job/officer/after_spawn(mob/living/carbon/human/H, mob/M)
. = ..()
Expand Down Expand Up @@ -89,6 +89,12 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
destination = /area/security/checkpoint/science
spawn_point = locate(/obj/effect/landmark/start/depsec/science) in GLOB.department_security_spawns
accessory = /obj/item/clothing/accessory/armband/science
if(SEC_DEPT_SERVICE)
ears = /obj/item/radio/headset/headset_sec/alt/department/service
dep_access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE)
destination = /area/security/checkpoint/service
spawn_point = locate(/obj/effect/landmark/start/depsec/service) in GLOB.department_security_spawns
accessory = /obj/item/clothing/accessory/armband/service

if(accessory)
var/obj/item/clothing/under/U = H.w_uniform
Expand Down Expand Up @@ -174,3 +180,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
/obj/item/radio/headset/headset_sec/alt/department/sci
keyslot = new /obj/item/encryptionkey/headset_sec
keyslot2 = new /obj/item/encryptionkey/headset_sci

/obj/item/radio/headset/headset_sec/alt/department/service
keyslot = new /obj/item/encryptionkey/headset_sec
keyslot2 = new /obj/item/encryptionkey/headset_service
Binary file modified icons/mob/accessories.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/accessories.dmi
Binary file not shown.
Binary file modified icons/turf/areas.dmi
Binary file not shown.