mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 07:08:00 +01:00
Removes the voting cooldown fix and the say_log timestamp and coordinates.
Adds two files I forgot to add in the previous commit, somehow...
This commit is contained in:
@@ -147,7 +147,7 @@ var/datum/subsystem/vote/SSvote
|
||||
if(!mode)
|
||||
if(started_time != null)
|
||||
var/next_allowed_time = (started_time + config.vote_delay)
|
||||
if(next_allowed_time > world.time && !check_rights_for(usr.client,R_ADMIN))
|
||||
if(next_allowed_time > world.time)
|
||||
return 0
|
||||
|
||||
reset()
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
if(!A.secondsElectrified)
|
||||
A.secondsElectrified = 30
|
||||
A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
|
||||
add_logs(usr, A, "electrified", addition="at [A.x],[A.y],[A.z]")
|
||||
add_logs(usr, A, "electrified")
|
||||
spawn(10)
|
||||
if(A)
|
||||
while (A.secondsElectrified > 0)
|
||||
@@ -136,7 +136,7 @@
|
||||
if(A.secondsElectrified != -1)
|
||||
A.secondsElectrified = -1
|
||||
A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
|
||||
add_logs(usr, A, "electrified", addition="at [A.x],[A.y],[A.z]")
|
||||
add_logs(usr, A, "electrified")
|
||||
if(WIRE_SAFETY) // Cut to disable safeties, mend to re-enable.
|
||||
A.safe = mend
|
||||
if(WIRE_TIMING) // Cut to disable auto-close, mend to re-enable.
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
var/turf/target_turf = get_turf(target)
|
||||
if(target_turf)
|
||||
var/turflist = getline(user, target_turf)
|
||||
add_logs(user, target, "flamethrowered", src, "at [target.x],[target.y],[target.z]")
|
||||
add_logs(user, target, "flamethrowered", src)
|
||||
flame_turf(turflist)
|
||||
|
||||
/obj/item/weapon/flamethrower/attackby(obj/item/W, mob/user, params)
|
||||
|
||||
@@ -98,13 +98,8 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
|
||||
if(!message)
|
||||
return
|
||||
|
||||
var/turf/T = get_turf(src)
|
||||
|
||||
var/logged_msg = "\[[time_stamp()]\] [message]"
|
||||
if(T)
|
||||
logged_msg += " ([T.x], [T.y], [T.z])"
|
||||
//Log of what we've said, plain message, no spans or junk
|
||||
say_log += logged_msg
|
||||
say_log += message
|
||||
|
||||
var/message_range = 7
|
||||
var/radio_return = radio(message, message_mode, spans)
|
||||
@@ -116,6 +111,7 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
|
||||
message_range = 1
|
||||
|
||||
//No screams in space, unless you're next to someone.
|
||||
var/turf/T = get_turf(src)
|
||||
var/datum/gas_mixture/environment = T.return_air()
|
||||
var/pressure = (environment)? environment.return_pressure() : 0
|
||||
if(pressure < SOUND_MINIMUM_PRESSURE)
|
||||
|
||||
Reference in New Issue
Block a user