Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Actors/admonitor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ statePuncherPrimary:onStep(function(actor, data)
if data.fired == 2 and actor.image_index >= 16 then
data.fired = 3
if gm._mod_net_isHost() then
local attack = actor:fire_explosion(actor.x + 75 * actor.image_xscale, actor.y - 5, 130, 32, 4.2, nil, gm.constants.wSparks4).attack_info
local attack = actor:fire_explosion(actor.x + 75 * actor.image_xscale, actor.y - 13, 130, 40, 4.2, nil, gm.constants.wSparks4).attack_info
attack.__ssr_puncher_push = 4 * actor.image_xscale
end
end
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# SSR Changelog *spoilers below!!*

## 0.1.3
- Added 3-4 skins to every survivor except Technician (cuz he had them already)
- Resprited Balloon, Coffee Bag, Cryptic Source, Juddering Egg, Roulette, Watch Metronome and Wonder Herbs
- Added a log for MULE
- Added a russian translation for Clay Admonitor's log
- Clay Admonitor's attack is now slightly taller so you can't jump over it
- Artifact of Displacement no longer includes stage 5s in the randomization process (broke Artifact of Tempus unlock)
- Fixed M.I.D.A.S not giving money
- Fixed Technician crashing the game when attempting to build a turret while holding a Mocha
- Fixed Technician upgraded Forced Shutdown mine erroring when a Magma Worm or a Bramble are in its range

## 0.1.2
- Various fixes for Mule and Technician
- New enemy: Clay Admonitor
Expand Down
2 changes: 1 addition & 1 deletion Items/balloon.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local sprite_item = Resources.sprite_load(NAMESPACE, "Balloon", path.combine(PATH, "Sprites/Items/balloon.png"), 1, 17, 17)
local sprite_item = Resources.sprite_load(NAMESPACE, "Balloon", path.combine(PATH, "Sprites/Items/balloon.png"), 1, 17, 19)
local sprite_effect = Resources.sprite_load(NAMESPACE, "EfBalloon", path.combine(PATH, "Sprites/Items/Effects/balloon.png"), 6, 4, 6)
local sound_pop = Resources.sfx_load(NAMESPACE, "BalloonPop", path.combine(PATH, "Sounds/Items/balloonPop.ogg"))

Expand Down
Binary file modified Sprites/Items/balloon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Survivors/technician.lua
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ end)
obj_mine_pull:onStep(function(inst)
inst.ff = inst.ff + 1
local targets = List.new()
inst:collision_circle_list(inst.x, inst.y, MACHINE_MINE_PULL_RADIUS, gm.constants.pActorCollisionBase, false, true, targets, false)
inst:collision_circle_list(inst.x, inst.y, MACHINE_MINE_PULL_RADIUS, gm.constants.pActor, false, true, targets, false)
for _, target in ipairs(targets) do
--Check if we should pull the target
--Pulling is weird with ropes so climbing enemies are excluded
Expand Down
Loading