mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-17 18:19:16 +01:00
Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29
# 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:
@@ -35,7 +35,7 @@
|
||||
playsound(living_target, 'sound/effects/magic/fireball.ogg', 20, TRUE)
|
||||
new /obj/effect/temp_visual/fire(living_target.loc)
|
||||
addtimer(CALLBACK(src, PROC_REF(pushback), living_target, user), 1) //no free backstabs, we push AFTER module stuff is done
|
||||
living_target.adjustFireLoss(bonus_value, forced = TRUE)
|
||||
living_target.adjust_fire_loss(bonus_value, forced = TRUE)
|
||||
|
||||
/obj/item/crusher_trophy/tail_spike/proc/pushback(mob/living/target, mob/living/user)
|
||||
if(!QDELETED(target) && !QDELETED(user) && (!target.anchored || ismegafauna(target))) //megafauna will always be pushed
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
static_lighting = TRUE
|
||||
requires_power = FALSE
|
||||
default_gravity = STANDARD_GRAVITY
|
||||
area_flags = BLOBS_ALLOWED | UNIQUE_AREA
|
||||
area_flags = BLOBS_ALLOWED
|
||||
flags_1 = CAN_BE_DIRTY_1
|
||||
|
||||
//Survival Capsule
|
||||
|
||||
@@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
|
||||
C.visible_message(span_danger("[C]'s eye protection blocks the sand!"), span_warning("Your eye protection blocks the sand!"))
|
||||
return
|
||||
C.adjust_eye_blur(12 SECONDS)
|
||||
C.adjustStaminaLoss(15)//the pain from your eyes burning does stamina damage
|
||||
C.adjust_stamina_loss(15)//the pain from your eyes burning does stamina damage
|
||||
C.adjust_confusion(5 SECONDS)
|
||||
to_chat(C, span_userdanger("\The [src] gets into your eyes! The pain, it burns!"))
|
||||
qdel(src)
|
||||
@@ -483,7 +483,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
|
||||
var/index = sideslist.Find(coinflip)
|
||||
if (index == 2)//tails
|
||||
user.visible_message(span_suicide("\the [src] lands on [coinflip]! [user] promptly falls over, dead!"))
|
||||
user.adjustOxyLoss(200)
|
||||
user.adjust_oxy_loss(200)
|
||||
user.death(FALSE)
|
||||
user.set_suicide(TRUE)
|
||||
user.suicide_log()
|
||||
@@ -664,7 +664,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
|
||||
/obj/item/coin/eldritch/heads_action(mob/user)
|
||||
var/mob/living/living_user = user
|
||||
if(!IS_HERETIC(user))
|
||||
living_user.adjustBruteLoss(5)
|
||||
living_user.adjust_brute_loss(5)
|
||||
return
|
||||
for(var/obj/machinery/door/airlock/target_airlock in range(airlock_range, user))
|
||||
if(target_airlock.density)
|
||||
@@ -675,7 +675,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
|
||||
/obj/item/coin/eldritch/tails_action(mob/user)
|
||||
var/mob/living/living_user = user
|
||||
if(!IS_HERETIC(user))
|
||||
living_user.adjustFireLoss(5)
|
||||
living_user.adjust_fire_loss(5)
|
||||
return
|
||||
for(var/obj/machinery/door/airlock/target_airlock in range(airlock_range, user))
|
||||
if(target_airlock.locked)
|
||||
|
||||
Reference in New Issue
Block a user