cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 02:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
Fox McCloud
2018-02-20 00:50:08 -05:00
parent 5c24e7720d
commit 1685ae6042
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/time.dm
+5 -5
View File
@@ -74,7 +74,7 @@ proc/isDay(var/month, var/day)
//Takes a value of time in deciseconds.
//Returns a text value of that number in hours, minutes, or seconds.
/proc/DisplayTimeText(time_value)
var/second = time_value*0.1
var/second = time_value * 0.1
var/second_adjusted = null
var/second_rounded = FALSE
var/minute = null
@@ -84,8 +84,8 @@ proc/isDay(var/month, var/day)
if(!second)
return "0 seconds"
if(second >= 60)
minute = round_down(second/60)
second = round(second - (minute*60), 0.1)
minute = round_down(second / 60)
second = round(second - (minute * 60), 0.1)
second_rounded = TRUE
if(second) //check if we still have seconds remaining to format, or if everything went into minute.
second_adjusted = round(second) //used to prevent '1 seconds' being shown
@@ -115,8 +115,8 @@ proc/isDay(var/month, var/day)
if(!minute)
return "[second]"
if(minute >= 60)
hour = round_down(minute/60,1)
minute = (minute - (hour*60))
hour = round_down(minute / 60,1)
minute = (minute - (hour * 60))
if(minute) //alot simpler from here since you don't have to worry about fractions
if(minute != 1)
if((day || hour) && second)
code/game/machinery/dance_machine.dm
+9 -9
View File
@@ -333,7 +333,7 @@
/obj/machinery/disco/proc/dance2(mob/living/M)
for(var/i = 1, i < 10, i++)
for(var/d in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
for(var/d in list(NORTH, SOUTH, EAST, WEST, EAST, SOUTH, NORTH, SOUTH, EAST, WEST, EAST, SOUTH))
M.setDir(d)
if(i == WEST && !M.incapacitated())
M.SpinAnimation(7, 1)
@@ -348,23 +348,23 @@
switch(i)
if(1 to 15)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(0,1)
initial_matrix.Translate(0, 1)
animate(M, transform = initial_matrix, time = 1, loop = 0)
if(16 to 30)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(1,-1)
initial_matrix.Translate(1, -1)
animate(M, transform = initial_matrix, time = 1, loop = 0)
if(31 to 45)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(-1,-1)
initial_matrix.Translate(-1, -1)
animate(M, transform = initial_matrix, time = 1, loop = 0)
if(46 to 60)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(-1,1)
initial_matrix.Translate(-1, 1)
animate(M, transform = initial_matrix, time = 1, loop = 0)
if(61 to 75)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(1,0)
initial_matrix.Translate(1, 0)
animate(M, transform = initial_matrix, time = 1, loop = 0)
M.setDir(turn(M.dir, 90))
switch(M.dir)
@@ -389,7 +389,7 @@
/obj/machinery/disco/proc/dance4(mob/living/M)
var/speed = rand(1,3)
var/speed = rand(1, 3)
set waitfor = 0
var/time = 30
while(time)
@@ -462,10 +462,10 @@
if(!(M in rangers))
rangers[M] = TRUE
M.playsound_local(get_turf(M), null, 100, channel = CHANNEL_JUKEBOX, S = song_played)
if(prob(5+(allowed(M)*4)) && M.canmove)
if(prob(5+(allowed(M) * 4)) && M.canmove)
dance(M)
for(var/mob/L in rangers)
if(get_dist(src,L) > 10)
if(get_dist(src, L) > 10)
rangers -= L
if(!L || !L.client)
continue