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

Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29

Browse Source 
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
#	_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	code/_onclick/hud/new_player.dm
#	code/datums/components/squashable.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/datums/diseases/chronic_illness.dm
#	code/datums/status_effects/buffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/stamcrit.dm
#	code/game/machinery/computer/crew.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/wall_mounted.dm
#	code/game/turfs/closed/indestructible.dm
#	code/modules/admin/view_variables/filterrific.dm
#	code/modules/antagonists/heretic/influences.dm
#	code/modules/cargo/orderconsole.dm
#	code/modules/client/preferences.dm
#	code/modules/events/space_vines/vine_mutations.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/carbon/human/death.dm
#	code/modules/mob/living/carbon/human/species_types/jellypeople.dm
#	code/modules/mob/living/damage_procs.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mob_spawn/mob_spawn.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/projectiles/guns/ballistic/launchers.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/reagents/chemistry/machinery/chem_dispenser.dm
#	code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/surgery/healing.dm
#	code/modules/unit_tests/designs.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	tgui/packages/tgui/interfaces/ChemDispenser.tsx
This commit is contained in:
nevimer
2025-11-29 22:49:21 -05:00
parent 4519d710d3 2bf063c693
commit baf3837ae8
1185 changed files with 39068 additions and 32028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/aifixer.dm
+3 -3
View File
@@ -68,9 +68,9 @@
say("Not enough energy. Restoration cancelled.")
return FALSE
var/need_mob_update = FALSE
need_mob_update += occupier.adjustOxyLoss(-5, updating_health = FALSE)
need_mob_update += occupier.adjustFireLoss(-5, updating_health = FALSE)
need_mob_update += occupier.adjustBruteLoss(-5, updating_health = FALSE)
need_mob_update += occupier.adjust_oxy_loss(-5, updating_health = FALSE)
need_mob_update += occupier.adjust_fire_loss(-5, updating_health = FALSE)
need_mob_update += occupier.adjust_brute_loss(-5, updating_health = FALSE)
if(need_mob_update)
occupier.updatehealth()
if(occupier.health >= 0 && occupier.stat == DEAD)
code/game/machinery/computer/crew.dm
+4 -4
View File
@@ -312,10 +312,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
// Damage
if (sensor_mode >= SENSOR_VITALS)
entry += list(
"oxydam" = round(tracked_living_mob.getOxyLoss(), 1),
"toxdam" = round(tracked_living_mob.getToxLoss(), 1),
"burndam" = round(tracked_living_mob.getFireLoss(), 1),
"brutedam" = round(tracked_living_mob.getBruteLoss(), 1),
"oxydam" = round(tracked_living_mob.get_oxy_loss(), 1),
"toxdam" = round(tracked_living_mob.get_tox_loss(), 1),
"burndam" = round(tracked_living_mob.get_fire_loss(), 1),
"brutedam" = round(tracked_living_mob.get_brute_loss(), 1),
"health" = round(tracked_living_mob.health, 1),
)
code/game/machinery/computer/operating_computer.dm
+4 -4
View File
@@ -126,10 +126,10 @@
data["patient"]["blood_type"] = patient.get_bloodtype()?.name || "UNKNOWN"
data["patient"]["maxHealth"] = patient.maxHealth
data["patient"]["minHealth"] = HEALTH_THRESHOLD_DEAD
data["patient"]["bruteLoss"] = patient.getBruteLoss()
data["patient"]["fireLoss"] = patient.getFireLoss()
data["patient"]["toxLoss"] = patient.getToxLoss()
data["patient"]["oxyLoss"] = patient.getOxyLoss()
data["patient"]["bruteLoss"] = patient.get_brute_loss()
data["patient"]["fireLoss"] = patient.get_fire_loss()
data["patient"]["toxLoss"] = patient.get_tox_loss()
data["patient"]["oxyLoss"] = patient.get_oxy_loss()
if(patient.surgeries.len)
for(var/datum/surgery/procedure in patient.surgeries)
var/datum/surgery_step/surgery_step = GLOB.surgery_steps[procedure.steps[procedure.status]]
code/game/machinery/computer/orders/order_items/mining/order_toys.dm
+1 -1
View File
@@ -34,6 +34,6 @@
cost_per_order = 525
/datum/orderable_item/toys_drones/drone_sentience
purchase_path = /obj/item/slimepotion/slime/sentience/mining
purchase_path = /obj/item/slimepotion/sentience/mining
cost_per_order = 850
code/game/machinery/computer/telescreen.dm
+14 -1
View File
@@ -71,7 +71,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai
/obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload)
. = ..()
if(mapload)
find_and_hang_on_wall()
find_and_hang_on_atom()
register_context()
RegisterSignal(SSdcs, COMSIG_GLOB_NETWORK_BROADCAST_UPDATED, PROC_REF(on_network_broadcast_updated))
speakers = new(src)
@@ -551,3 +551,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/deep_sto
say("The [tv_show_name] show has [is_show_active ? "begun" : "ended"]")
var/announcement = is_show_active ? pick(tv_starters) : pick(tv_enders)
set_network_broadcast_status(tv_network_id, is_show_active, announcement)
/obj/machinery/computer/security/telescreen/monastery
name = "monastery monitor"
desc = "A telescreen that connects to the monastery's camera network."
network = list(CAMERANET_NETWORK_MONASTERY)
frame_type = /obj/item/wallframe/telescreen/monastery
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/monastery, 32)
/obj/item/wallframe/telescreen/monastery
name = "monastery telescreen frame"
result_path = /obj/machinery/computer/security/telescreen/monastery