cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-17 11:05:16 +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/objects/effects/decals/cleanable/blood.dm
+6 -8
View File
@@ -739,11 +739,10 @@
. += bloodstep_overlay
if(emissive_alpha && emissive_alpha < alpha && !dried)
var/enter_emissive_state = "[enter_state]_emissive-[emissive_alpha]"
var/mutable_appearance/emissive_overlay = bloody_footprints_cache[enter_emissive_state]
var/enter_emissive_state = "[enter_state]_emissive-[Ddir]-[emissive_alpha]"
var/image/emissive_overlay = bloody_footprints_cache[enter_emissive_state]
if(!emissive_overlay)
emissive_overlay = blood_emissive(icon, "[icon_state_to_use]1")
emissive_overlay.dir = Ddir
emissive_overlay = image(blood_emissive(icon, "[icon_state_to_use]1"), dir = Ddir)
bloody_footprints_cache[enter_emissive_state] = emissive_overlay
. += emissive_overlay
@@ -756,11 +755,10 @@
. += bloodstep_overlay
if(emissive_alpha && emissive_alpha < alpha && !dried)
var/exit_emissive_state = "[exit_state]_emissive-[emissive_alpha]"
var/mutable_appearance/emissive_overlay = bloody_footprints_cache[exit_emissive_state]
var/exit_emissive_state = "[exit_state]_emissive-[Ddir]-[emissive_alpha]"
var/image/emissive_overlay = bloody_footprints_cache[exit_emissive_state]
if(!emissive_overlay)
emissive_overlay = blood_emissive(icon, "[icon_state_to_use]2")
emissive_overlay.dir = Ddir
emissive_overlay = image(blood_emissive(icon, "[icon_state_to_use]2"), dir = Ddir)
bloody_footprints_cache[exit_emissive_state] = emissive_overlay
. += emissive_overlay
code/game/objects/effects/decals/cleanable/fuel.dm
+3 -2
View File
@@ -78,8 +78,9 @@
/obj/effect/decal/cleanable/fuel_pool/bullet_act(obj/projectile/hit_proj)
. = ..()
ignite()
log_combat(hit_proj.firer, src, "used [hit_proj] to ignite")
if(hit_proj.damage > 0)
ignite()
log_combat(hit_proj.firer, src, "used [hit_proj] to ignite")
/obj/effect/decal/cleanable/fuel_pool/attackby(obj/item/item, mob/user, list/modifiers, list/attack_modifiers)
if(item.ignition_effect(src, user))