cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025

Browse Source
This commit is contained in:
Roxy
2025-10-23 17:38:23 -04:00
parent e9ee4dea19 2a5fae5d2a
commit e28e9fbdba
453 changed files with 20635 additions and 15897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapping/access_helpers.dm
+10
View File
@@ -185,6 +185,11 @@
access_list += list(ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS)
return access_list
/obj/effect/mapping_helpers/airlock/access/any/medical/paramedic/get_access()
var/list/access_list = ..()
access_list += ACCESS_PARAMEDIC
return access_list
// -------------------- Science access helpers
/obj/effect/mapping_helpers/airlock/access/any/science
icon_state = "access_helper_sci"
@@ -661,6 +666,11 @@
access_list += ACCESS_PSYCHOLOGY
return access_list
/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic/get_access()
var/list/access_list = ..()
access_list += ACCESS_PARAMEDIC
return access_list
// -------------------- Science access helpers
/obj/effect/mapping_helpers/airlock/access/all/science
icon_state = "access_helper_sci"
code/modules/mapping/mapping_helpers.dm
+3 -1
View File
@@ -953,7 +953,9 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_atoms_ontop)
body_bag.insert(new_human, TRUE)
body_bag.close()
body_bag.handle_tag("[new_human.real_name][new_human.dna?.species ? " - [new_human.dna.species.name]" : " - Human"]")
body_bag.tag_name = "[new_human.real_name][new_human.dna?.species ? " - [new_human.dna.species.name]" : " - Human"]"
body_bag.AddComponent(/datum/component/rename, "[initial(body_bag.name)][body_bag.tag_name? " - [body_bag.tag_name]" : null]", body_bag.desc)
body_bag.update_icon()
body_bag.forceMove(morgue_tray)
morgue_tray.update_appearance()