Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs.

This commit is contained in:
SkyMarshal
2011-12-18 00:23:02 -07:00
parent a0298c0477
commit fc3914364f
13 changed files with 160 additions and 38 deletions
+35
View File
@@ -727,6 +727,40 @@
alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
return
if (href_list["defense"])
if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
var/mob/living/M = locate(href_list["defense"])
if (isliving(M) && istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
switch(alert("Shall they be equipped with a flash or mace?",,"Flash","Mace", "Cancel"))
if("Flash")
if(!H.s_store)
H.equip_if_possible(new /obj/item/device/flash(H), H.slot_l_store)
else if(!H.s_store)
H.equip_if_possible(new /obj/item/device/flash(H), H.slot_s_store)
else
alert("The target lacked an open pocket.", null, null, null, null, null)
return
if("Mace")
if(!H.s_store)
H.equip_if_possible(new /obj/item/weapon/pepperspray/small(H), H.slot_l_store)
else if(!H.s_store)
H.equip_if_possible(new /obj/item/weapon/pepperspray/small(H), H.slot_s_store)
else
alert("The target lacked an open pocket.", null, null, null, null, null)
return
if("Cancel")
return
message_admins("\red Admin [key_name_admin(usr)] gave [key_name_admin(M)] something to defend themselves!", 1)
log_admin("[key_name(usr)] defensified [key_name(M)]")
return
else
alert("This action can only be performed on living humans.", null, null, null, null, null)
return
else
alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
return
if (href_list["makeai"]) //Yes, im fucking lazy, so what? it works ... hopefully
if (src.level>=3)
var/mob/M = locate(href_list["makeai"])
@@ -1774,6 +1808,7 @@
foo += text("<A HREF='?src=\ref[src];sendtoprison=\ref[M]'>Prison</A> | ")
// foo += text("<A HREF='?src=\ref[src];sendtomaze=\ref[M]'>Maze</A> | ")
foo += text("<A HREF='?src=\ref[src];revive=\ref[M]'>Heal/Revive</A> | ")
foo += text("<A HREF='?src=\ref[src];defense=\ref[M]'>Defensize</A> | ")
else
foo += text("<B>Hasn't Entered Game</B> | ")
foo += text("<A href='?src=\ref[src];forcespeech=\ref[M]'>Forcesay</A> | ")
+1 -1
View File
@@ -1714,7 +1714,7 @@ datum
M:emote("scream")
M << "\red You're sprayed directly in the eyes with pepperspray!"
M.eye_blurry = max(M.eye_blurry, 60)
M.eye_blind = max(M.eye_blind, 16)
M.eye_blind = max(M.eye_blind, 12)
M:weakened = max(M:weakened, 20)
M.drop_item()
+1 -1
View File
@@ -2740,7 +2740,7 @@
icon_state = "peppertank"
anchored = 1
density = 0
amount_per_transfer_from_this = 45
amount_per_transfer_from_this = 30
New()
..()
reagents.add_reagent("condensedcapsaicin",1000)
@@ -528,7 +528,7 @@
if (emptyHand)
ears.DblClick()
return
if (!( istype(W, /obj/item/clothing/ears) ) && !( istype(W, /obj/item/device/radio/headset) ))
if ((!istype(W, /obj/item) || W.w_class > 1 || w_uniform) && !(istype(W, /obj/item/device/radio/headset)))
return
u_equip(W)
ears = W