Skip to content

Commit 5e422f6

Browse files
authored
Minor Fixpack: Christmas 2024 Edition (#1155)
* Minor Fixpack: Christmas 2024 Edition Robotics is now a Medical access in all respective UIs. - fixes #1032 Chairs face your direction when you place them from their item form. - fixes #1068 * Fixes #105 but hey we don't use them anymore anyways soooooo
1 parent b1e5b8a commit 5e422f6

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

code/__DEFINES/access.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@
400400
ACCESS_CHEMISTRY, \
401401
ACCESS_VIROLOGY, \
402402
ACCESS_SURGERY, \
403+
ACCESS_ROBOTICS, \
403404
ACCESS_MECH_MEDICAL, \
404405
ACCESS_CMO, \
405406
ACCESS_PHARMACY, \
@@ -414,7 +415,6 @@
414415
ACCESS_ORDNANCE, \
415416
ACCESS_ORDNANCE_STORAGE, \
416417
ACCESS_GENETICS, \
417-
ACCESS_ROBOTICS, \
418418
ACCESS_XENOBIOLOGY, \
419419
ACCESS_MECH_SCIENCE, \
420420
ACCESS_MINISAT, \

code/controllers/subsystem/datacore.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ SUBSYSTEM_DEF(datacore)
280280
var/datum/data/record/security/S = new()
281281
S.fields[DATACORE_ID] = id
282282
S.fields[DATACORE_NAME] = H.real_name
283-
S.fields[DATACORE_CRIMINAL_STATUS] = CRIMINAL_NONE
283+
S.fields[DATACORE_CRIMINAL_STATUS] = job.default_security_status || CRIMINAL_NONE
284284
S.fields[DATACORE_CITATIONS] = list()
285285
S.fields[DATACORE_CRIMES] = list()
286286
S.fields[DATACORE_NOTES] = "No notes."

code/game/objects/structures/beds_chairs/chair.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
349349
var/obj/structure/chair/C = new origin_type(get_turf(loc))
350350
C.set_custom_materials(custom_materials)
351351
TransferComponents(C)
352-
C.setDir(dir)
352+
C.setDir(user.dir)
353353
qdel(src)
354354

355355
/obj/item/chair/proc/smash(mob/living/user)

code/modules/jobs/job_types/_job.dm

+3
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ GLOBAL_LIST_INIT(job_display_order, list(
166166
/// What company can employ this job? First index is default
167167
var/list/employers = list()
168168

169+
/// Default security status. Skipped if null.
170+
var/default_security_status = null
171+
169172

170173
/datum/job/New()
171174
. = ..()

code/modules/jobs/job_types/prisoner.dm

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
family_heirlooms = list(/obj/item/pen/blue)
2727
rpg_title = "Defeated Miniboss"
28+
default_security_status = CRIMINAL_INCARCERATED
2829
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
2930

3031

0 commit comments

Comments
 (0)