cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Francisca buffs, fixes maneuvers. (#15052)

Browse Source
This commit is contained in:
Matt Atlas
2022-11-07 19:30:10 +01:00
committed by GitHub
parent 5da09cca43
commit 03b78debc1
7 changed files with 88 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/ships/computers/helm.dm
+2 -2
View File
@@ -224,7 +224,7 @@
var/ndir = text2num(href_list["roll"])
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
visible_message(SPAN_DANGER("[H] starts tilting the yoke all the way to the [ndir == WEST ? "right" : "left"]!"))
visible_message(SPAN_DANGER("[H] starts tilting the yoke all the way to the [ndir == WEST ? "left" : "right"]!"))
if(do_after(H, 1 SECOND))
connected.combat_roll(ndir)
@@ -232,7 +232,7 @@
var/ndir = text2num(href_list["turn"])
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
visible_message(SPAN_DANGER("[H] starts twisting the yoke all the way to the [ndir == WEST ? "right" : "left"]!"))
visible_message(SPAN_DANGER("[H] starts twisting the yoke all the way to the [ndir == WEST ? "left" : "right"]!"))
if(do_after(H, 1 SECOND))
connected.combat_turn(ndir)
code/modules/overmap/ships/ship.dm
+21 -4
View File
@@ -273,7 +273,8 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
/obj/effect/overmap/visitable/ship/proc/combat_roll(var/new_dir)
burn()
forceMove(get_step(src, new_dir))
var/dir_to_move = turn(dir, new_dir == WEST ? 90 : -90)
forceMove(get_step(src, dir_to_move))
for(var/mob/living/L in living_mob_list)
if(L.z in map_z)
to_chat(L, SPAN_DANGER("<font size=4>The ship rapidly inclines under your feet!</font>"))
@@ -286,10 +287,26 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
/obj/effect/overmap/visitable/ship/proc/combat_turn(var/new_dir)
burn()
var/angle = 45
var/angle = -45
if(new_dir == WEST)
angle = -45
dir = turn(dir, angle)
angle = 45
var/direction = turn(dir, angle)
accelerate(direction, 1000)
if(direction & EAST)
speed[1] = abs(speed[1])
else if(direction & WEST)
if(speed[1] > 0)
speed[1] = -speed[1]
else
speed[1] = 0
if(direction & NORTH)
speed[2] = abs(speed[2])
else if(direction & SOUTH)
if(speed[2] > 0)
speed[2] = -speed[2]
else
speed[2] = 0
update_icon()
for(var/mob/living/L in living_mob_list)
if(L.z in map_z)
to_chat(L, SPAN_DANGER("The ship rapidly turns under your feet!"))