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

Merge branch 'master' of github.com:tgstation/tgstation into upstream-2026-06-23

Browse Source
This commit is contained in:
Roxy
2026-06-23 15:51:55 -04:00
parent 4f87df6b81 8f10b2af19
commit de4c3b255d
1007 changed files with 40287 additions and 33507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bodyparts/_bodyparts.dm
+3 -2
View File
@@ -301,7 +301,8 @@
owner = null
QDEL_LIST_ASSOC_VAL(applied_items)
if(LAZYLEN(applied_items))
QDEL_LIST_ASSOC_VAL(applied_items)
QDEL_LAZYLIST(scars)
for(var/atom/movable/movable in contents)
@@ -768,7 +769,7 @@
check_wounding(wounding_type, wounding_dmg, wound_bonus, exposed_wound_bonus, attack_direction, damage_source = damage_source, wound_clothing = wound_clothing)
for(var/datum/wound/iter_wound as anything in wounds)
iter_wound.receive_damage(wounding_type, wounding_dmg, wound_bonus, damage_source)
iter_wound.receive_damage(wounding_type, wounding_dmg, wound_bonus, attack_direction, damage_source)
/*
// END WOUND HANDLING
code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+8 -2
View File
@@ -206,12 +206,12 @@
/obj/item/bodypart/leg/left/zombie/infectious
limb_id = SPECIES_ZOMBIE
should_draw_greyscale = FALSE
speed_modifier = 0.8 //braaaaains
speed_modifier = 0.5 //braaaaains
/obj/item/bodypart/leg/right/zombie/infectious
limb_id = SPECIES_ZOMBIE
should_draw_greyscale = FALSE
speed_modifier = 0.8 //braaaaains
speed_modifier = 0.5 //braaaaains
///PODPEOPLE
/obj/item/bodypart/head/pod
@@ -434,6 +434,7 @@
limb_id = BODYPART_ID_BONE
// These are always disabled
disabling_threshold_percentage = 0
bodypart_disabled = TRUE
/obj/item/bodypart/head/skeleton/nonfunctional/Initialize(mapload)
. = ..()
@@ -442,6 +443,7 @@
/obj/item/bodypart/chest/skeleton/nonfunctional
limb_id = BODYPART_ID_BONE
disabling_threshold_percentage = 0
bodypart_disabled = TRUE
/obj/item/bodypart/chest/skeleton/nonfunctional/Initialize(mapload)
. = ..()
@@ -460,6 +462,7 @@
/obj/item/bodypart/arm/left/skeleton/nonfunctional
limb_id = BODYPART_ID_BONE
disabling_threshold_percentage = 0
bodypart_disabled = TRUE
/obj/item/bodypart/arm/left/skeleton/nonfunctional/Initialize(mapload)
. = ..()
@@ -468,6 +471,7 @@
/obj/item/bodypart/arm/right/skeleton/nonfunctional
limb_id = BODYPART_ID_BONE
disabling_threshold_percentage = 0
bodypart_disabled = TRUE
/obj/item/bodypart/arm/right/skeleton/nonfunctional/Initialize(mapload)
. = ..()
@@ -476,6 +480,7 @@
/obj/item/bodypart/leg/left/skeleton/nonfunctional
limb_id = BODYPART_ID_BONE
disabling_threshold_percentage = 0
bodypart_disabled = TRUE
/obj/item/bodypart/leg/left/skeleton/nonfunctional/Initialize(mapload)
. = ..()
@@ -484,6 +489,7 @@
/obj/item/bodypart/leg/right/skeleton/nonfunctional
limb_id = BODYPART_ID_BONE
disabling_threshold_percentage = 0
bodypart_disabled = TRUE
/obj/item/bodypart/leg/right/skeleton/nonfunctional/Initialize(mapload)
. = ..()
code/modules/surgery/organs/internal/ears/_ears.dm
+1
View File
@@ -199,6 +199,7 @@
sprite_accessory_override = /datum/sprite_accessory/ears/cat/cybernetic
organ_flags = ORGAN_ROBOTIC
failing_desc = "seems to be broken."
restyle_flags = NONE
/obj/item/organ/ears/cat/cybernetic/upgraded
name = "cybernetic cat ears"
code/modules/surgery/organs/internal/heart/_heart.dm
+1 -3
View File
@@ -48,13 +48,11 @@
/obj/item/organ/heart/Remove(mob/living/carbon/heartless, special, movement_flags)
. = ..()
if(!special)
addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 12 SECONDS)
addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 12 SECONDS, TIMER_DELETE_ME)
beat = BEAT_NONE
owner?.stop_sound_channel(CHANNEL_HEARTBEAT)
/obj/item/organ/heart/proc/stop_if_unowned()
if(QDELETED(src))
return
if(IS_ROBOTIC_ORGAN(src))
return
if(isnull(owner))
code/modules/surgery/surgery_tools.dm
+2 -1
View File
@@ -160,7 +160,8 @@
inhand_icon_state = "drill"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
hitsound = 'sound/items/weapons/circsawhit.ogg'
hitsound = 'sound/items/tools/drill_hit.ogg'
usesound = 'sound/items/tools/drill_use.ogg'
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*3)
obj_flags = CONDUCTS_ELECTRICITY
item_flags = SURGICAL_TOOL