mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-14 08:34:16 +01:00
Fixed some runtimes.
Job system once again has -1 as unlimited. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2451 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -654,7 +654,7 @@
|
||||
if (href_list["revive"])
|
||||
if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
|
||||
var/mob/living/M = locate(href_list["revive"])
|
||||
if (ismob(M))
|
||||
if (isliving(M))
|
||||
if(config.allow_admin_rev)
|
||||
M.revive()
|
||||
message_admins("\red Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!", 1)
|
||||
|
||||
@@ -21,4 +21,6 @@
|
||||
|
||||
usr << "Your message has been broadcast to administrators."
|
||||
log_admin("HELP: [key_name(src)]: [msg]")
|
||||
tension_master.new_adminhelp()
|
||||
if(tension_master)
|
||||
tension_master.new_adminhelp()
|
||||
return
|
||||
|
||||
@@ -182,7 +182,7 @@
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
|
||||
make_food(var/obj/container as obj)
|
||||
var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = locate() in container
|
||||
if (!being_cooked.warm)
|
||||
if(being_cooked && !being_cooked.warm)
|
||||
warm_up(being_cooked)
|
||||
return being_cooked
|
||||
|
||||
|
||||
@@ -159,7 +159,7 @@ I kind of like the right click only--the window version can get a little confusi
|
||||
|
||||
// Hacky way of hopefully preventing a runtime error from happening
|
||||
if(vents.len < selection_position)
|
||||
vents.len = selection_position
|
||||
vents.len = selection_position//What the fuck is this I dont even, Right will likely have to fix this later
|
||||
|
||||
var/obj/machinery/atmospherics/unary/vent_pump/target_vent = vents[selection_position]
|
||||
if(target_vent)
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
return 1
|
||||
|
||||
if(href_list["ready"])
|
||||
if (!src.client.authenticated)
|
||||
if (!client.authenticated)
|
||||
src << "You are not authorized to enter the game."
|
||||
return
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
new_player_panel_proc()
|
||||
|
||||
if(href_list["observe"])
|
||||
if (!usr.client.authenticated)
|
||||
if (!client.authenticated)
|
||||
src << "You are not authorized to enter the game."
|
||||
return
|
||||
|
||||
@@ -191,7 +191,7 @@
|
||||
LateChoices()
|
||||
|
||||
if(href_list["SelectedJob"])
|
||||
if(!usr.client.authenticated)
|
||||
if(!client.authenticated)
|
||||
src << "You are not authorized to enter the game."
|
||||
return
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
in_chamber.yo = targloc.y - curloc.y
|
||||
in_chamber.xo = targloc.x - curloc.x
|
||||
spawn()
|
||||
in_chamber.process()
|
||||
if(in_chamber) in_chamber.process()
|
||||
sleep(1)
|
||||
in_chamber = null
|
||||
|
||||
|
||||
@@ -202,6 +202,7 @@ datum
|
||||
materials = list("$glass" = 2000, "acid" = 20)
|
||||
build_path = "/obj/item/weapon/circuitboard/air_management"
|
||||
|
||||
/* Uncomment if someone makes these buildable
|
||||
general_alert
|
||||
name = "Circuit Design (General Alert Console)"
|
||||
desc = "Allows for the construction of circuit boards used to build a General Alert console."
|
||||
@@ -210,6 +211,7 @@ datum
|
||||
build_type = IMPRINTER
|
||||
materials = list("$glass" = 2000, "acid" = 20)
|
||||
build_path = "/obj/item/weapon/circuitboard/general_alert"
|
||||
*/
|
||||
|
||||
robocontrol
|
||||
name = "Circuit Design (Robotics Control Console)"
|
||||
|
||||
Reference in New Issue
Block a user