cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-22 05:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unconscious and Knockdown are now status effects (#28696)

Browse Source 
* Unconscious and Knockdown are now status effects

* Fixes #28628

* fixes borgs

* the terrifying second argument

* Much better
This commit is contained in:
Joan Lung
2017-06-23 12:00:49 -04:00
committed by Jordan Brown
parent 06f2b4f45e
commit deae811756
58 changed files with 376 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+40 -36
View File
@@ -1340,23 +1340,24 @@
return
var/mob/M = locate(href_list["tdome1"])
if(!ismob(M))
to_chat(usr, "This can only be used on instances of type /mob.")
if(!isliving(M))
to_chat(usr, "This can only be used on instances of type /mob/living.")
return
if(isAI(M))
to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai.")
return
var/mob/living/L = M
for(var/obj/item/I in M)
M.dropItemToGround(I, TRUE)
for(var/obj/item/I in L)
L.dropItemToGround(I, TRUE)
M.Unconscious(100)
L.Unconscious(100)
sleep(5)
M.loc = pick(GLOB.tdome1)
L.forceMove(pick(GLOB.tdome1))
spawn(50)
to_chat(M, "<span class='adminnotice'>You have been sent to the Thunderdome.</span>")
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)")
to_chat(L, "<span class='adminnotice'>You have been sent to the Thunderdome.</span>")
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 1)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 1)")
else if(href_list["tdome2"])
if(!check_rights(R_FUN))
@@ -1366,23 +1367,24 @@
return
var/mob/M = locate(href_list["tdome2"])
if(!ismob(M))
to_chat(usr, "This can only be used on instances of type /mob.")
if(!isliving(M))
to_chat(usr, "This can only be used on instances of type /mob/living.")
return
if(isAI(M))
to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai.")
return
var/mob/living/L = M
for(var/obj/item/I in M)
M.dropItemToGround(I, TRUE)
for(var/obj/item/I in L)
L.dropItemToGround(I, TRUE)
M.Unconscious(100)
L.Unconscious(100)
sleep(5)
M.loc = pick(GLOB.tdome2)
L.forceMove(pick(GLOB.tdome2))
spawn(50)
to_chat(M, "<span class='adminnotice'>You have been sent to the Thunderdome.</span>")
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)")
to_chat(L, "<span class='adminnotice'>You have been sent to the Thunderdome.</span>")
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 2)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 2)")
else if(href_list["tdomeadmin"])
if(!check_rights(R_FUN))
@@ -1392,20 +1394,21 @@
return
var/mob/M = locate(href_list["tdomeadmin"])
if(!ismob(M))
to_chat(usr, "This can only be used on instances of type /mob.")
if(!isliving(M))
to_chat(usr, "This can only be used on instances of type /mob/living.")
return
if(isAI(M))
to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai.")
return
var/mob/living/L = M
M.Unconscious(100)
L.Unconscious(100)
sleep(5)
M.loc = pick(GLOB.tdomeadmin)
L.forceMove(pick(GLOB.tdomeadmin))
spawn(50)
to_chat(M, "<span class='adminnotice'>You have been sent to the Thunderdome.</span>")
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)")
to_chat(L, "<span class='adminnotice'>You have been sent to the Thunderdome.</span>")
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Admin.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Admin.)")
else if(href_list["tdomeobserve"])
if(!check_rights(R_FUN))
@@ -1415,27 +1418,28 @@
return
var/mob/M = locate(href_list["tdomeobserve"])
if(!ismob(M))
to_chat(usr, "This can only be used on instances of type /mob.")
if(!isliving(M))
to_chat(usr, "This can only be used on instances of type /mob/living.")
return
if(isAI(M))
to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai.")
return
var/mob/living/L = M
for(var/obj/item/I in M)
M.dropItemToGround(I, TRUE)
for(var/obj/item/I in L)
L.dropItemToGround(I, TRUE)
if(ishuman(M))
var/mob/living/carbon/human/observer = M
if(ishuman(L))
var/mob/living/carbon/human/observer = L
observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), slot_w_uniform)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), slot_shoes)
M.Unconscious(100)
L.Unconscious(100)
sleep(5)
M.loc = pick(GLOB.tdomeobserve)
L.forceMove(pick(GLOB.tdomeobserve))
spawn(50)
to_chat(M, "<span class='adminnotice'>You have been sent to the Thunderdome.</span>")
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)")
to_chat(L, "<span class='adminnotice'>You have been sent to the Thunderdome.</span>")
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Observer.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Observer.)")
else if(href_list["revive"])
if(!check_rights(R_REJUVINATE))