This commit is contained in:
quotefox
2019-11-01 08:24:56 +00:00
parent b796fb6bcc
commit d775e4eef3
13 changed files with 101 additions and 10 deletions
@@ -141,6 +141,13 @@
ViewManifest()
if(href_list["SelectedJob"])
if(!SSticker || !SSticker.IsRoundInProgress())
var/msg = "[key_name(usr)] attempted to join the round using a href that shouldn't be available at this moment!"
log_admin(msg)
message_admins(msg)
to_chat(usr, "<span class='danger'>The round is either not ready, or has already finished...</span>")
return
if(!GLOB.enter_allowed)
to_chat(usr, "<span class='notice'>There is an administrative lock on entering the game!</span>")
@@ -163,6 +163,8 @@
missing -= BP.body_zone
for(var/obj/item/I in BP.embedded_objects)
msg += "<B>[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [BP.name]!</B>\n"
if(BP.broken)
msg += "<B>[t_He] [t_has] \a [I] broken [BP.name]!</B>\n"
for(var/X in disabled)
var/obj/item/bodypart/BP = X
@@ -673,6 +673,7 @@
var/status = ""
var/brutedamage = LB.brute_dam
var/burndamage = LB.burn_dam
var/broken = LB.broken
if(hallucination)
if(prob(30))
brutedamage += rand(30,40)
@@ -700,7 +701,8 @@
status += LB.medium_burn_msg
else if(burndamage > 0)
status += LB.light_burn_msg
if(broken == 1)
status = "broken"
if(status == "")
status = "OK"
var/no_damage
@@ -711,6 +713,7 @@
for(var/obj/item/I in LB.embedded_objects)
to_send += "\t <a href='?src=[REF(src)];embedded_object=[REF(I)];embedded_limb=[REF(LB)]' class='warning'>There is \a [I] embedded in your [LB.name]!</a>\n"
for(var/t in missing)
for(var/t in missing)
to_send += "<span class='boldannounce'>Your [parse_zone(t)] is missing!</span>\n"
@@ -807,11 +807,16 @@ Pass a positive integer as an argument to override a bot's default speed.
switch(href_list["operation"])
if("patrol")
auto_patrol = !auto_patrol
bot_reset()
if(!issilicon(usr) && !IsAdminGhost(usr) && !(bot_core.allowed(usr) || !locked))
return TRUE
if("remote")
remote_disabled = !remote_disabled
if("hack")
if(!issilicon(usr) && !IsAdminGhost(usr))
var/msg = "[key_name(usr)] attempted to hack a bot with a href that shouldn't be available!"
message_admins(msg)
log_admin(msg)
return TRUE
if(emagged != 2)
emagged = 2
hacked = TRUE
@@ -132,6 +132,9 @@ Auto Patrol: []"},
if(..())
return 1
if(!issilicon(usr) && !IsAdminGhost(usr) && !(bot_core.allowed(usr) || !locked))
return TRUE
switch(href_list["operation"])
if("idcheck")
idcheck = !idcheck