Skip to content

Commit

Permalink
oh no
Browse files Browse the repository at this point in the history
  • Loading branch information
casualspacestation14enjoyer committed Dec 31, 2024
1 parent 00ce3a4 commit 28887cf
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(ticker)
var/current_state = GAME_STATE_STARTUP //state of current round (used by process()) Use the defines GAME_STATE_* !
var/force_ending = 0 //Round was ended by admin intervention
// If true, there is no lobby phase, the game starts immediately.
var/start_immediately = TRUE
var/start_immediately = FALSE
var/setup_done = FALSE //All game setup done including mode post setup and

var/hide_mode = 0
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/effects/effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@

/obj/effect/dummy/singularity_act()
return

/obj/effect/warning
name = "GET OUT! NOW!"
icon_state = "trap"
11 changes: 8 additions & 3 deletions code/game/objects/items/rogueweapons/ranged/cannon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
H.playsound_local(get_turf(H), 'sound/foley/tinnitus.ogg', 45, FALSE)
for(var/mob/living/carbon/human/H in get_step(src, turn(dir, 180)))
var/turf/turfa = get_ranged_target_turf(src, turn(dir, 180), 2)
H.throw_at(turfa, 2, 1, null, FALSE)
H.throw_at(turfa, 4, 1, null, FALSE)
H.take_overall_damage(45)
visible_message("<span class='danger'>\The [H] is thrown back from \the [src]'s recoil!</span>")
flick("cannona_fire", src)
Expand Down Expand Up @@ -135,7 +135,7 @@
H.playsound_local(get_turf(H), 'sound/foley/tinnitus.ogg', 45, FALSE)
for(var/mob/living/carbon/human/H in get_step(src, turn(dir, 180)))
var/turf/turfa = get_ranged_target_turf(src, turn(dir, 180), 2)
H.throw_at(turfa, 2, 1, null, FALSE)
H.throw_at(turfa, 3, 1, null, FALSE)
H.take_overall_damage(45)
visible_message("<span class='danger'>\The [H] is thrown back from \the [src]'s recoil!</span>")
flick("cannona_fire", src)
Expand All @@ -147,7 +147,12 @@
var/oldx = x
var/newx = oldx + plusx

src.x = newx
var/turf/epicenter = locate(newx,y,z)
var/obj/effect/warning/G = new(epicenter)

spawn(3 SECONDS)
qdel(G)
explosion(epicenter, heavy_impact_range = 2, light_impact_range = 4, smoke = TRUE, soundin = pick('sound/misc/explode/incendiary (1).ogg','sound/misc/explode/incendiary (2).ogg'))

playsound(src.loc, 'sound/misc/explode/explosion.ogg', 100, FALSE)
sleep(4)
Expand Down
2 changes: 1 addition & 1 deletion config/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ STATIONNAME WARMONGERS
HUB

## Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready.
LOBBY_COUNTDOWN 145
LOBBY_COUNTDOWN 60

## Round End Time: This is the amount of time after the round ends that players have to murder death kill each other.
ROUND_END_COUNTDOWN 60
Expand Down

0 comments on commit 28887cf

Please sign in to comment.