cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes up some helpers.

Browse Source
This commit is contained in:
SkyMarshal
2015-02-03 01:42:33 -07:00
parent 0aff1a6c72
commit 15bf312f13
4 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
baystation12.dme
View File

@@ -871,7 +871,6 @@
#include "code\modules\clothing\spacesuits\rig\modules\computer.dm" #include "code\modules\clothing\spacesuits\rig\modules\computer.dm"
#include "code\modules\clothing\spacesuits\rig\modules\modules.dm" #include "code\modules\clothing\spacesuits\rig\modules\modules.dm"
#include "code\modules\clothing\spacesuits\rig\modules\ninja.dm" #include "code\modules\clothing\spacesuits\rig\modules\ninja.dm"
#include "code\modules\clothing\spacesuits\rig\modules\rig_weapons.dm"
#include "code\modules\clothing\spacesuits\rig\modules\utility.dm" #include "code\modules\clothing\spacesuits\rig\modules\utility.dm"
#include "code\modules\clothing\spacesuits\rig\modules\vision.dm" #include "code\modules\clothing\spacesuits\rig\modules\vision.dm"
#include "code\modules\clothing\spacesuits\rig\suits\alien.dm" #include "code\modules\clothing\spacesuits\rig\suits\alien.dm"

14
code/__HELPERS/game.dm
View File

@@ -10,16 +10,10 @@
return null return null
/proc/get_area(O) /proc/get_area(O)
var/atom/location = O var/turf/loc = get_turf(O)
var/i if(!loc)
for(i=1, i<=20, i++) return null
if(isarea(location)) return loc.loc
return location
else if (istype(location))
location = location.loc
else
return null
return 0
/proc/get_area_name(N) //get area by its name /proc/get_area_name(N) //get area by its name
for(var/area/A in world) for(var/area/A in world)

4
code/__HELPERS/maths.dm
View File

@@ -119,7 +119,3 @@ var/list/sqrtTable = list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4,
var/d = max - min var/d = max - min
var/t = Floor((val - min) / d) var/t = Floor((val - min) / d)
return val - (t * d) return val - (t * d)
proc/RaiseToPower(num, power)
if(!power) return 1
return (power-- > 1 ? num * RaiseToPower(num, power) : num)

4
code/modules/events/event_manager.dm
View File

@@ -195,12 +195,12 @@
admin_log_and_message_admins("has [report_at_round_end ? "enabled" : "disabled"] the round end event report.") admin_log_and_message_admins("has [report_at_round_end ? "enabled" : "disabled"] the round end event report.")
else if(href_list["dec_timer"]) else if(href_list["dec_timer"])
var/datum/event_container/EC = locate(href_list["event"]) var/datum/event_container/EC = locate(href_list["event"])
var/decrease = (60 * RaiseToPower(10, text2num(href_list["dec_timer"]))) var/decrease = (60 * 10 ** text2num(href_list["dec_timer"]))
EC.next_event_time -= decrease EC.next_event_time -= decrease
admin_log_and_message_admins("decreased timer for [severity_to_string[EC.severity]] events by [decrease/600] minute(s).") admin_log_and_message_admins("decreased timer for [severity_to_string[EC.severity]] events by [decrease/600] minute(s).")
else if(href_list["inc_timer"]) else if(href_list["inc_timer"])
var/datum/event_container/EC = locate(href_list["event"]) var/datum/event_container/EC = locate(href_list["event"])
var/increase = (60 * RaiseToPower(10, text2num(href_list["inc_timer"]))) var/increase = (60 * 10 ** text2num(href_list["inc_timer"]))
EC.next_event_time += increase EC.next_event_time += increase
admin_log_and_message_admins("increased timer for [severity_to_string[EC.severity]] events by [increase/600] minute(s).") admin_log_and_message_admins("increased timer for [severity_to_string[EC.severity]] events by [increase/600] minute(s).")
else if(href_list["select_event"]) else if(href_list["select_event"])