Skip to content

Commit

Permalink
Merge branch 'master' into Thruster
Browse files Browse the repository at this point in the history
  • Loading branch information
Thera-Pissed authored Nov 16, 2023
2 parents e902bb6 + c3a7c0c commit f7ae69d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 19 deletions.
9 changes: 0 additions & 9 deletions code/game/objects/effects/anomalies/anomalies_plasmasoul.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@
to_chat(mob, span_warning("Your blood feels thick.."))
playsound(mob, 'sound/effects/bubbles.ogg', 50)


if(!COOLDOWN_FINISHED(src, pulse_secondary_cooldown))
return

COOLDOWN_START(src, pulse_secondary_cooldown, pulse_delay*5)
var/turf/open/tile = get_turf(src)
if(istype(tile))
tile.atmos_spawn_air("plasma=750;TEMP=200") //free lag!

/obj/effect/anomaly/plasmasoul/Bumped(atom/movable/AM)
var/turf/open/spot = locate(rand(src.x-effectrange, src.x+effectrange), rand(src.y-effectrange, src.y+effectrange), src.z)
for(var/mob/living/mob in range(effectrange,src))
Expand Down
5 changes: 5 additions & 0 deletions html/changelogs/AutoChangeLog-pr-2471.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
author: Bjarl
changes:
- {balance: passive plasmasoul gas making is gone}
- {bugfix: plasmasouls no longer make infinite free lag}
delete-after: true
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-2479.yml

This file was deleted.

6 changes: 0 additions & 6 deletions html/changelogs/AutoChangeLog-pr-2484.yml

This file was deleted.

7 changes: 7 additions & 0 deletions html/changelogs/archive/2023-11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,10 @@
water splashed on the sauna.
- rscadd: Towels. You can use them in-hand to change it from waist, chest, or head.
- bugfix: PGF items now have real names and descriptions.
2023-11-16:
Bjarl:
- bugfix: The polymodial sensor array now properly changes icon_state.
PositiveEntropy:
- bugfix: Cybersun outfits have been adjusted to be less syndicate-generalist and
more Cybersun.
- imageadd: Cybersun has received a full visual overhaul, as well as new goodies!

0 comments on commit f7ae69d

Please sign in to comment.