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

Merge branch 'master' into upstream-2026-06-23

Browse Source
This commit is contained in:
Roxy
2026-06-27 13:07:00 -04:00
parent a80c339b26 e6bec663bf
commit a19098fcac
58 changed files with 801 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_update_icons.dm
-2
View File
@@ -464,8 +464,6 @@
var/head_update = FALSE
var/list/new_limbs = list()
var/datum/component/transformation/transform = GetComponent(/datum/component/transformation) // BUBBER EDIT START - Transformation component override.
if(transform)
transform.on_transform_limb_icon(src)
for(var/body_zone, limb_untyped in transform ? transform.dummy.get_bodyparts_by_zones() : get_bodyparts_by_zones()) // BUBBER EDIT END | ORG: for(var/body_zone, limb_untyped in get_bodyparts_by_zones())
var/obj/item/bodypart/limb = limb_untyped
var/obj/item/bodypart/stump_limb_check = get_bodypart(body_zone, TRUE) // BUBBER EDIT START
code/modules/mob/living/silicon/ai/ai.dm
+2 -2
View File
@@ -2,7 +2,7 @@
#define CHARACTER_TYPE_SELF "My Character"
#define CHARACTER_TYPE_CREWMEMBER "Station Member"
/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai)
/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai, latejoining = FALSE)
. = ..()
if(!target_ai) //If there is no player/brain inside.
new/obj/structure/ai_core(loc, CORE_STATE_FINISHED) //New empty terminal.
@@ -23,7 +23,7 @@
create_eye()
if((target_ai.mind && target_ai.mind.active) || SSticker.current_state == GAME_STATE_SETTING_UP)
if((target_ai.mind && target_ai.mind.active) || SSticker.current_state == GAME_STATE_SETTING_UP || latejoining)
target_ai.mind.transfer_to(src)
if(is_antag())
to_chat(src, span_userdanger("You have been installed as an AI! "))