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

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

Browse Source
This commit is contained in:
Roxy
2025-10-15 19:34:41 -04:00
parent 00716094d8 7007a304d3
commit d14e538393
656 changed files with 24772 additions and 15866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/icemoonruin_code/mining_site.dm
+1 -1
View File
@@ -27,7 +27,7 @@
icon_state = "corpseminer"
// Gives the minesite corpses the gutted effect so that the boss ignores them
/obj/effect/mob_spawn/corpse/human/minesite/special(mob/living/spawned_mob)
/obj/effect/mob_spawn/corpse/human/minesite/special(mob/living/spawned_mob, mob/mob_possessor)
. = ..()
spawned_mob.apply_status_effect(/datum/status_effect/gutted)
code/modules/mapfluff/ruins/lavalandruin_code/biodome_winter.dm
+1 -1
View File
@@ -31,7 +31,7 @@
var/mob/thrown_by = throwingdatum?.get_thrower()
if(ismovable(hit_atom) && !caught && (!thrown_by || thrown_by && COOLDOWN_FINISHED(src, freeze_cooldown)))
freeze_hit_atom(hit_atom)
if(thrown_by && !caught)
if(istype(thrown_by) && !caught)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, throw_range+2, throw_speed, null, TRUE), 0.1 SECONDS)
/obj/item/freeze_cube/proc/freeze_hit_atom(atom/movable/hit_atom)
code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+1 -1
View File
@@ -661,7 +661,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
/obj/item/analyzer/hilbertsanalyzer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!istype(interacting_with, /obj/item/hilbertshotel))
return ..()
if(!user.CanReach(interacting_with))
if(!interacting_with.IsReachableBy(user))
to_chat(user, span_warning("It's to far away to scan!"))
return ITEM_INTERACT_BLOCKING
var/obj/item/hilbertshotel/sphere = interacting_with
code/modules/mapfluff/ruins/spaceruin_code/meateor.dm
+1 -1
View File
@@ -11,7 +11,7 @@
/// Tiger cultist corpse but with an exit wound
/obj/effect/mob_spawn/corpse/human/tigercultist/perforated
/obj/effect/mob_spawn/corpse/human/tigercultist/perforated/special(mob/living/carbon/human/spawned_human)
/obj/effect/mob_spawn/corpse/human/tigercultist/perforated/special(mob/living/carbon/human/spawned_human, mob/mob_possessor)
. = ..()
var/obj/item/bodypart/chest/their_chest = spawned_human.get_bodypart(BODY_ZONE_CHEST)