Debug messages & frying

- Vote counter
- Frying people.
- Food Fix.
- Gav Gen fix
This commit is contained in:
SoundScopes
2014-08-25 10:01:57 +01:00
parent 433f1d05e2
commit 9286382dac
5 changed files with 79 additions and 14 deletions
+11 -1
View File
@@ -21,7 +21,7 @@ var/list/gravity_field_generators = list() // We will keep track of this by addi
/client/proc/cmd_dev_reset_gravity()
set category = "Debug"
set name = "Restore Default Gravity"
set desc = "Resets all gravity on the entire server"
set desc = "Resets all gravity on the entire server(This spams Scopes like mad.)"
if(!check_rights(R_DEBUG|R_DEV)) return
@@ -36,6 +36,9 @@ var/list/gravity_field_generators = list() // We will keep track of this by addi
src << "\red The game hasn't started yet!"
return
if(alert(usr, "Be sure to warn Scopes, Chris, and Skull. This could be very spammy for their logs", "Restore gravity", "No", "Yes") == "No")
return 0
world << "\red \b Resetting Gravity Simulation."
gravity_is_on = 1
spawn(10)
@@ -44,10 +47,12 @@ var/list/gravity_field_generators = list() // We will keep track of this by addi
continue
A.has_gravity = 1
msg_scopes("Gravity reset in: [A.name]")
for(var/area/SubA in A.related)
SubA.has_gravity = 1
for(var/mob/living/carbon/human/M in SubA)
M:float(0)
msg_scopes("Did you enjoy that insane amount of things")
world << "\red Gravity Simulation reset."
feedback_add_details("admin_verb","RSG")
@@ -156,6 +161,7 @@ var/list/gravity_field_generators = list() // We will keep track of this by addi
var/list/localareas = list()
var/effectiverange = 255 //Currently unused due to errors
var/round_start = 2 //To help stop a bug with round start
var/has_been_charged = 0
/obj/machinery/gravity_field_generator/main/Del() // If we somehow get deleted, remove all of our other parts.
log_debug("Gravity Generator Destroyed")
@@ -329,6 +335,8 @@ var/list/gravity_field_generators = list() // We will keep track of this by addi
var/alert = 0
var/area/area = get_area(src)
if(new_state) // If we turned on
if(has_been_charged)
return
if(gravity_in_level() == 0)
alert = 1
gravity_is_on = 1
@@ -355,8 +363,10 @@ var/list/gravity_field_generators = list() // We will keep track of this by addi
if(charging_state != POWER_IDLE)
if(charging_state == POWER_UP && charge_count >= 100)
set_state(1)
has_been_charged = 1
else if(charging_state == POWER_DOWN && charge_count <= 0)
set_state(0)
has_been_charged = 0
else
if(charging_state == POWER_UP)
charge_count += 2
+1 -4
View File
@@ -52,7 +52,6 @@
src.attack_hand(user)
/obj/machinery/medical_alarm/attack_hand(mob/user)
// var/last_icon = icon_state
icon_state = "eng_press"
add_fingerprint(usr)
// if(!allowed(user))
@@ -64,7 +63,7 @@
for(var/area/A in area.master.related)
A.medical_alarm = on
spawn(5)
spawn(8)
A.updateicon()
for(var/obj/machinery/medical_alarm/L in A)
@@ -72,8 +71,6 @@
L.updateicon()
L.activate()
// area.master.power_change()
/obj/machinery/medical_alarm/proc/make_noise()
for (var/mob/O in hearers(6, src.loc))
if(!played_sound)
+2
View File
@@ -238,6 +238,8 @@ datum/controller/vote
started_time = world.time
var/timedifference = round((world.time - last_vote_time))
var/timedifference_text
timedifference_text = time2text(timedifference, "hh:mm:ss")
msg_scopes("timedifference_text debug: [timedifference]")
timedifference_text = time2text(timedifference,"mm:ss")
msg_scopes("timedifference: [timedifference] timedifference_text: [timedifference_text] started_time: [started_time]")
for(var/client/C in admins)
+62 -9
View File
@@ -23,19 +23,33 @@
if(ismob(G.affecting))
var/mob/living/GM = G.affecting
for (var/mob/V in viewers(usr))
V.show_message("[usr] starts forcing [GM.name] towards the fryer.", 3)
V.show_message("[usr] starts pushing [GM.name] into the fryer.", 3)
if(do_after(usr, 20))
GM.apply_damage(20, BURN, "head")
var/body_part = fry_mob_by_limb(GM, user.zone_sel.selecting)
if(!body_part) //If you fry a valid part this will be set
for (var/mob/V in viewers(usr))
if(GM.sleeping||GM.resting)
V.show_message("[GM.name] is to much of a dead weight to be place in the fryer")
else
V.show_message("[GM.name] breaks free.", 3)
return
for (var/mob/C in viewers(src))
C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
C.show_message("\red [GM.name]'s [body_part] has been placed in the [src] by [user].", 3)
del(G)
usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Has placed [GM.name] ([GM.ckey]) in in the fryer.</font>")
GM.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fried by [usr.name] ([usr.ckey])</font>")
msg_admin_attack("[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a fryer. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[usr.x];Y=[usr.y];Z=[usr.z]'>JMP</a>)")
else
for (var/mob/V in viewers(usr))
V.show_message("[usr] broke free")
return
user << "<span class='notice'>[src] is still active!</span>"
return
else
user << "<span class='notice'>[src] is still active!</span>"
return
if(!istype(I, /obj/item/weapon/reagent_containers/food/snacks/))
user << "<span class='warning'>Budget cuts won't let you put that in there.</span>"
@@ -46,6 +60,49 @@
else
fry_food(I, user)
/obj/machinery/deepfryer/proc/fry_mob_by_limb(var/mob/living/M, var/limb)
switch(limb)
if("head")
M.apply_damage(40, BURN, limb)
M << "\red Your head burns"
return "head"
if("l_leg")
M.apply_damage(20, BURN, limb)
M.apply_damage(30, BURN, "l_foot")
M << "\red Your left foot and leg frys"
return "left leg"
if("l_foot")
M.apply_damage(20, BURN, limb)
M << "\red Your left foot frys"
return "left foot"
if("r_leg")
M.apply_damage(20, BURN, limb)
M.apply_damage(30, BURN, "r_foot")
M << "\red Your right foot and leg frys"
return "right leg"
if("r_foot")
M.apply_damage(20, BURN, limb)
M << "\red Your right foot frys"
return "right foot"
if("l_arm")
M.apply_damage(20, BURN, limb)
M.apply_damage(30, BURN, "l_hand")
M << "\red Your left arm and hand frys"
return "left arm"
if("l_hand")
M.apply_damage(20, BURN, limb)
M << "\red Your left hand frys"
return "left hand"
if("r_arm")
M.apply_damage(20, BURN, limb)
M.apply_damage(30, BURN, "r_hand")
M << "\red Your right arm and hand frys"
return "right arm"
if("r_hand")
M.apply_damage(20, BURN, limb)
M << "\red Your right hand frys"
return "right hand"
return null
/obj/machinery/deepfryer/attack_hand(mob/user)
if(on && frying)
@@ -80,8 +137,4 @@
icon_state = "fryer_off"
on = FALSE
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
return
/obj/machinery/deepfryer/proc/fry_human(var/mob/M, var/mob/user)
world << "AFGIFAIOOSFHOAE GLAEUIBGASEB"
return
@@ -279,6 +279,9 @@
New()
..()
reagents.add_reagent("nutriment", 10)
Del()
contents = null
..()
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy"