mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
whole lotta bugfixes
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
text_gain_indication = "<span class='notice'>You begin to fade into the shadows.</span>"
|
||||
text_lose_indication = "<span class='notice'>You become fully visible.</span>"
|
||||
|
||||
|
||||
/datum/mutation/human/stealth/on_life(mob/living/carbon/human/owner)
|
||||
var/turf/simulated/T = get_turf(owner)
|
||||
if(!istype(T))
|
||||
@@ -26,8 +27,11 @@
|
||||
lowest_value = 256 * 14
|
||||
text_gain_indication = "<span class='notice'>You feel one with your surroundings.</span>"
|
||||
text_lose_indication = "<span class='notice'>You feel oddly exposed.</span>"
|
||||
|
||||
var/last_location
|
||||
/datum/mutation/human/chameleon/on_life(mob/living/carbon/human/owner)
|
||||
if(owner.loc != last_location)
|
||||
owner.alpha = round(255 * 0.80)
|
||||
last_location = owner.loc
|
||||
if((world.time - owner.last_movement) >= 30 && !owner.stat && owner.canmove && !owner.restrained())
|
||||
owner.alpha -= 25
|
||||
else
|
||||
|
||||
@@ -203,6 +203,7 @@
|
||||
qdel(src) //correctly before deleting the grenade.
|
||||
|
||||
/obj/item/weapon/grenade/chem_grenade/proc/mix_reagents()
|
||||
reagents.chem_temp = 1000
|
||||
for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
|
||||
G.reagents.trans_to(src, G.reagents.total_volume)
|
||||
|
||||
|
||||
@@ -615,10 +615,10 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob,
|
||||
M.visible_message("<span class='warning'>[M]'s body convulses a bit.</span>")
|
||||
if(M.health <= config.health_threshold_dead && !M.suiciding && !ghost && !(NOCLONE in M.mutations))
|
||||
M.stat = 1
|
||||
M.adjustBruteLoss(-10)
|
||||
M.adjustFireLoss(-10)
|
||||
M.adjustOxyLoss(-10)
|
||||
M.adjustToxLoss(-10)
|
||||
M.adjustBruteLoss(-20) // this should keep them from dying immediately
|
||||
M.adjustFireLoss(-20)
|
||||
M.adjustOxyLoss(-20)
|
||||
M.adjustToxLoss(-20)
|
||||
dead_mob_list -= M
|
||||
living_mob_list |= list(M)
|
||||
M.emote("gasp")
|
||||
|
||||
@@ -140,4 +140,5 @@ proc/goonchem_vortex(var/turf/simulated/T, var/setting_type, var/range, var/pull
|
||||
for(var/i = 0, i < pull_times, i++)
|
||||
step_away(X,T)
|
||||
else
|
||||
X.throw_at(T)
|
||||
for(var/i = 0, i < pull_times, i++)
|
||||
step_towards(X,T)
|
||||
@@ -103,12 +103,11 @@ datum/reagent/neurotoxin2
|
||||
|
||||
datum/reagent/neurotoxin2/on_mob_life(var/mob/living/M as mob)
|
||||
cycle_count++
|
||||
if(!M) M = holder.my_atom
|
||||
if(M.brainloss + M.toxloss <= 60)
|
||||
M.adjustBrainLoss(1*REM)
|
||||
M.adjustToxLoss(1*REM)
|
||||
if(cycle_count == 17)
|
||||
M.sleeping += 1
|
||||
M.sleeping += 10 // buffed so it works
|
||||
..()
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user