From a0298c047770285aea98566ce2f386d46b4d0a3f Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sat, 17 Dec 2011 18:37:23 -0700 Subject: [PATCH 1/7] Should improve pepper spray a bit. Reduced to 2 shot per Hawkie's request. --- .../objects/items/weapons/mops_cleaners.dm | 44 +++++++++---------- code/modules/chemical/Chemistry-Reagents.dm | 6 +-- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm index ca4ce5544a4..6fea7af4b12 100644 --- a/code/game/objects/items/weapons/mops_cleaners.dm +++ b/code/game/objects/items/weapons/mops_cleaners.dm @@ -14,15 +14,14 @@ MOP return /obj/item/weapon/cleaner/attack_self(var/mob/user as mob) - switch(catch) - if(0) - user << "\blue You flip the safety back on." - catch = 1 - return - if(1) - user << "\blue You flip the safety off." - catch = 0 - return + if(catch) + user << "\blue You flip the safety on." + catch = 1 + return + else + user << "\blue You flip the safety off." + catch = 0 + return /obj/item/weapon/cleaner/afterattack(atom/A as mob|obj, mob/user as mob) if (istype(A, /obj/item/weapon/storage )) @@ -179,25 +178,26 @@ MOP return +//Crowd control pepper spray, for Hawkie + /obj/item/weapon/pepperspray/New() - var/datum/reagents/R = new/datum/reagents(45) + var/datum/reagents/R = new/datum/reagents(30) reagents = R R.my_atom = src - R.add_reagent("condensedcapsaicin", 45) + R.add_reagent("condensedcapsaicin", 30) /obj/item/weapon/pepperspray/attack(mob/living/carbon/human/M as mob, mob/user as mob) return /obj/item/weapon/pepperspray/attack_self(var/mob/user as mob) - switch(catch) - if(0) - user << "\blue You flip the safety on." - catch = 1 - return - if(1) - user << "\blue You flip the safety off." - catch = 0 - return + if(catch) + user << "\blue You flip the safety on." + catch = 1 + return + else + user << "\blue You flip the safety off." + catch = 0 + return /obj/item/weapon/pepperspray/afterattack(atom/A as mob|obj, mob/user as mob) if (istype(A, /obj/item/weapon/storage )) @@ -205,8 +205,8 @@ MOP if (istype(A, /obj/effect/proc_holder/spell )) return else if (istype(A, /obj/structure/reagent_dispensers/peppertank) && get_dist(src,A) <= 1) - if(src.reagents.total_volume < 45) - A.reagents.trans_to(src, 45 - src.reagents.total_volume) + if(src.reagents.total_volume < 30) + A.reagents.trans_to(src, 30 - src.reagents.total_volume) user << "\blue Pepper spray refilled" playsound(src.loc, 'refill.ogg', 50, 1, -6) return diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 8e4e7863458..bece66e2588 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1709,13 +1709,13 @@ datum M << "\red Your glasses protect you from most of the pepperspray!" M:emote("scream") M.eye_blurry = max(M.eye_blurry, 20) - M.eye_blind = max(M.eye_blind, 6) + M.eye_blind = max(M.eye_blind, 4) return 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, 20) - M:paralysis = max(M:paralysis, 16) + M.eye_blind = max(M.eye_blind, 16) + M:weakened = max(M:weakened, 20) M.drop_item() frostoil From fc3914364f77aeded726ae6224a44b4fe4d2a4e2 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sun, 18 Dec 2011 00:23:02 -0700 Subject: [PATCH 2/7] Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs. --- code/defines/obj/storage.dm | 4 +- code/defines/obj/weapon.dm | 23 +++++- code/game/jobs/job/security.dm | 8 +- code/game/machinery/computer/security.dm | 32 +++++++- code/game/objects/closets/secure/security.dm | 1 + .../objects/items/weapons/mops_cleaners.dm | 70 ++++++++++++------ code/modules/admin/admin.dm | 35 +++++++++ code/modules/chemical/Chemistry-Reagents.dm | 2 +- code/modules/chemical/Chemistry-Tools.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- config/admins - Copy.txt | 16 ++++ config/admins.txt | 3 +- icons/obj/card.dmi | Bin 4383 -> 4205 bytes 13 files changed, 160 insertions(+), 38 deletions(-) create mode 100644 config/admins - Copy.txt diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 014e3a80667..7e60232d335 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -175,7 +175,7 @@ /obj/item/weapon/storage/gl_kit name = "Prescription Glasses" - desc = "This box contains nerd glasses." + desc = "This box contains vision correcting glasses." icon_state = "glasses" item_state = "syringe_kit" @@ -213,7 +213,7 @@ /obj/item/weapon/storage/trackimp_kit name = "Tracking Implant Kit" - desc = "Box full of scum-bag tracking utensils." + desc = "Box full of tracking utensils." icon_state = "implant" item_state = "syringe_kit" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 46357c867cf..83c3695da98 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -443,8 +443,8 @@ data = "Clown Land" /obj/item/weapon/card/emag - desc = "It's a card with a magnetic strip attached to some circuitry." - name = "cryptographic sequencer" + desc = "An identification card. No shit. Seems to have some funny chip on it, though." + name = "identification card" icon_state = "emag" item_state = "card-id" origin_tech = "magnets=2;syndicate=2" @@ -525,7 +525,7 @@ throw_range = 10 origin_tech = "combat=3;materials=3;engineering=3" -/obj/item/weapon/pepperspray +/obj/item/weapon/pepperspray //This is riot control desc = "Manufactred by UhangInc., used to blind and down an opponent quickly." icon = 'weapons.dmi' name = "pepperspray" @@ -537,6 +537,23 @@ throw_speed = 2 throw_range = 10 var/catch = 1 + var/BottleSize = 1 + var/ReagentAmount = 30 + +/obj/item/weapon/pepperspray/small //And this is for personal defense. + desc = "This appears to be a small, nonlethal, single use personal defense weapon. Hurts like a bitch, though." + icon = 'weapons.dmi' + name = "mace" + icon_state = "pepperspray" + item_state = "pepperspray" + flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY + throwforce = 3 + w_class = 1.0 + throw_speed = 2 + throw_range = 10 + catch = 1 + BottleSize = 0 + ReagentAmount = 1 /obj/item/weapon/clipboard name = "clipboard" diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index c45e01fbadf..fc2feda15b7 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -73,16 +73,18 @@ H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/detective(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/head/det_hat(H), H.slot_head) - var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H) +/* var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H) CIG.light("") - H.equip_if_possible(CIG, H.slot_wear_mask) + H.equip_if_possible(CIG, H.slot_wear_mask) */ + //Fuck that thing. --SkyMarshal H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves) H.equip_if_possible(new /obj/item/weapon/storage/fcard_kit(H.back), H.slot_in_backpack) H.equip_if_possible(new /obj/item/weapon/fcardholder(H), H.slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/suit/det_suit(H), H.slot_wear_suit) H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack) H.equip_if_possible(new /obj/item/weapon/zippo(H), H.slot_l_store) - H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/candy_corn(H), H.slot_h_store) +// H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/candy_corn(H), H.slot_h_store) +// No... just no. --SkyMarshal var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 7014680b9de..3d7902590d0 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -18,10 +18,36 @@ if(1.0) dat += text("Search Records
\nList Records
\nSearch Fingerprints
\nNew General Record
\n
\nRecord Maintenance
\n{Log Out}
\n", src, src, src, src, src, src) if(2.0) - dat += "Record List:
" + dat += {"Record List:
+ + + + + + + "} for(var/datum/data/record/R in data_core.general) - dat += text("[]: []
", src, R, R.fields["id"], R.fields["name"]) - dat += text("
Back", src) + var/crimstat = "" + for(var/datum/data/record/E in data_core.security) + if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + crimstat = E.fields["criminal"] + var/background + switch(crimstat) + if("*Arrest*") + background = "'background-color:#DC143C;'" + if("Incarcerated") + background = "'background-color:#CD853F;'" + if("Parolled") + background = "'background-color:#CD853F;'" + if("Released") + background = "'background-color:#3BB9FF;'" + if("None") + background = "'background-color:#00FF7F;'" + dat += text("", background, src, R, R.fields["name"], R.fields["id"]) + dat += text("", R.fields["rank"]) + dat += text("", R.fields["fingerprint"]) + dat += text("", crimstat) + dat += text("
Name (ID#)RankFingerprintsCriminal Status
[] (ID:[])[][][]

Back", src) if(3.0) dat += text("Records Maintenance
\nDelete All Records
\n
\nBack", src, src) if(4.0) diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index d6e5518fecc..fc5d24bdeff 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -134,6 +134,7 @@ new /obj/item/weapon/fcardholder(src) new /obj/item/weapon/clipboard(src) new /obj/item/device/detective_scanner(src) + new /obj/item/weapon/pepperspray/small(src) return diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm index 6fea7af4b12..ad0989bdcbc 100644 --- a/code/game/objects/items/weapons/mops_cleaners.dm +++ b/code/game/objects/items/weapons/mops_cleaners.dm @@ -15,13 +15,13 @@ MOP /obj/item/weapon/cleaner/attack_self(var/mob/user as mob) if(catch) - user << "\blue You flip the safety on." - catch = 1 - return - else user << "\blue You flip the safety off." catch = 0 return + else + user << "\blue You flip the safety on." + catch = 1 + return /obj/item/weapon/cleaner/afterattack(atom/A as mob|obj, mob/user as mob) if (istype(A, /obj/item/weapon/storage )) @@ -178,26 +178,26 @@ MOP return -//Crowd control pepper spray, for Hawkie +//Pepper spray, set up to make the 2 different types /obj/item/weapon/pepperspray/New() - var/datum/reagents/R = new/datum/reagents(30) + var/datum/reagents/R = new/datum/reagents(ReagentAmount) reagents = R R.my_atom = src - R.add_reagent("condensedcapsaicin", 30) + R.add_reagent("condensedcapsaicin", ReagentAmount) /obj/item/weapon/pepperspray/attack(mob/living/carbon/human/M as mob, mob/user as mob) return /obj/item/weapon/pepperspray/attack_self(var/mob/user as mob) if(catch) - user << "\blue You flip the safety on." - catch = 1 - return - else user << "\blue You flip the safety off." catch = 0 return + else + user << "\blue You flip the safety on." + catch = 1 + return /obj/item/weapon/pepperspray/afterattack(atom/A as mob|obj, mob/user as mob) if (istype(A, /obj/item/weapon/storage )) @@ -205,8 +205,8 @@ MOP if (istype(A, /obj/effect/proc_holder/spell )) return else if (istype(A, /obj/structure/reagent_dispensers/peppertank) && get_dist(src,A) <= 1) - if(src.reagents.total_volume < 30) - A.reagents.trans_to(src, 30 - src.reagents.total_volume) + if(src.reagents.total_volume < ReagentAmount) + A.reagents.trans_to(src, ReagentAmount - src.reagents.total_volume) user << "\blue Pepper spray refilled" playsound(src.loc, 'refill.ogg', 50, 1, -6) return @@ -221,14 +221,23 @@ MOP return playsound(src.loc, 'spray2.ogg', 50, 1, -6) - var/Sprays[3] - for(var/i=1, i<=3, i++) // intialize sprays + var/SprayNum = 0 //Setting up the differentiation for the 2 bottles. --SkyMarshal + var/SprayAmt = 0 + if(BottleSize) + SprayNum = 3 + SprayAmt = 5 + else + SprayNum = 1 + SprayAmt = 1 + + var/Sprays[SprayNum] + for(var/i=1, i<=SprayNum, i++) // intialize sprays if(src.reagents.total_volume < 1) break var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src)) D.name = "chemicals" D.icon = 'chempuff.dmi' - D.create_reagents(5) - src.reagents.trans_to(D, 5) + D.create_reagents(SprayAmt) + src.reagents.trans_to(D, SprayAmt) var/rgbcolor[3] var/finalcolor @@ -263,11 +272,23 @@ MOP var/obj/effect/decal/D = Sprays[i] if(!D) continue + var/turf/my_target = null // Spreads the sprays a little bit - var/turf/my_target = pick(the_targets) + if(i == 1) + my_target = T + else + my_target = pick(the_targets) + the_targets -= my_target - for(var/j=1, j<=rand(6,8), j++) + var/Dist = 0 + + if(BottleSize) + Dist = rand(6,8) + else + Dist = rand(2,3) + + for(var/j=1, j<=Dist, j++) step_towards(D, my_target) D.reagents.reaction(get_turf(D)) for(var/atom/t in get_turf(D)) @@ -287,9 +308,14 @@ MOP /obj/item/weapon/pepperspray/examine() set src in usr - usr << text("\icon[] [] units of pepperspray left!", src, src.reagents.total_volume) - ..() - return + if(BottleSize) + usr << text("\icon[] [] units of pepperspray left!", src, src.reagents.total_volume) + ..() + return + else + usr << text("\icon[] [] use(s) remaining!", src, src.reagents.total_volume) + ..() + return // MOP diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index b676da8ffbd..e1227e6eb45 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -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("Prison | ") // foo += text("Maze | ") foo += text("Heal/Revive | ") + foo += text("Defensize | ") else foo += text("Hasn't Entered Game | ") foo += text("Forcesay | ") diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index bece66e2588..b24a338f661 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -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() diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 2eebb272aca..8f9d55fdab3 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -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) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3a9274450bd..930a836a2a1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -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 diff --git a/config/admins - Copy.txt b/config/admins - Copy.txt new file mode 100644 index 00000000000..d4494bcbb47 --- /dev/null +++ b/config/admins - Copy.txt @@ -0,0 +1,16 @@ +abi79 - Game Master +arcalane - Game Admin +cacophony - Game Admin +cajoes - Game Admin +cib - Game Master +compactninja - Game Master +hawk_v3 - Game Admin +headswe - Game Master +iaryni - Game Master +masterofapples - Game Admin +megacaesar - Game Admin +miniature - Game Master +misterfox - Game Admin +mloc - Game Master +spaceman96 - Game Admin +uristqwerty - Game Master \ No newline at end of file diff --git a/config/admins.txt b/config/admins.txt index 2bc78a67b3c..c4833cb9a92 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -5,8 +5,7 @@ cajoes - Game Admin cib - Game Master compactninja - Game Master hawk_v3 - Game Admin -headswe - Game Master -iaryni - Game Master +skymarshal - Game Master masterofapples - Game Admin megacaesar - Game Admin miniature - Game Master diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index b49faa386b78a1977caafe5b7550ad7484a80840..aa88951b244b6b5ff21aa6eb243494fdd457275d 100644 GIT binary patch delta 4083 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 j(w-VMi%^gOnP1)phjuy1>S9Yh0J~Y3*_u|Fc*p%0DNY8r delta 4263 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 Date: Sun, 18 Dec 2011 00:26:53 -0700 Subject: [PATCH 3/7] Fixed some derp. --- code/modules/mob/living/carbon/human/human.dm | 2 +- config/admins.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 930a836a2a1..3a9274450bd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -528,7 +528,7 @@ if (emptyHand) ears.DblClick() return - if ((!istype(W, /obj/item) || W.w_class > 1 || w_uniform) && !(istype(W, /obj/item/device/radio/headset))) + if (!( istype(W, /obj/item/clothing/ears) ) && !( istype(W, /obj/item/device/radio/headset) )) return u_equip(W) ears = W diff --git a/config/admins.txt b/config/admins.txt index c4833cb9a92..2bc78a67b3c 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -5,7 +5,8 @@ cajoes - Game Admin cib - Game Master compactninja - Game Master hawk_v3 - Game Admin -skymarshal - Game Master +headswe - Game Master +iaryni - Game Master masterofapples - Game Admin megacaesar - Game Admin miniature - Game Master From 5030421e426af2634ab4c6afd086c6edc4143544 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sun, 18 Dec 2011 00:29:45 -0700 Subject: [PATCH 4/7] removed some more derp --- config/admins - Copy.txt | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 config/admins - Copy.txt diff --git a/config/admins - Copy.txt b/config/admins - Copy.txt deleted file mode 100644 index d4494bcbb47..00000000000 --- a/config/admins - Copy.txt +++ /dev/null @@ -1,16 +0,0 @@ -abi79 - Game Master -arcalane - Game Admin -cacophony - Game Admin -cajoes - Game Admin -cib - Game Master -compactninja - Game Master -hawk_v3 - Game Admin -headswe - Game Master -iaryni - Game Master -masterofapples - Game Admin -megacaesar - Game Admin -miniature - Game Master -misterfox - Game Admin -mloc - Game Master -spaceman96 - Game Admin -uristqwerty - Game Master \ No newline at end of file From 3d51c2487bad94beaa6210cd9de3a516c9a67a48 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sun, 18 Dec 2011 01:06:05 -0700 Subject: [PATCH 5/7] Fixed a bunch of descriptions. --- code/defines/obj/weapon.dm | 59 ++++++++++++++++++++++++++------------ maps/tgstation.2.0.8.dmm | 2 +- 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 83c3695da98..b326f0fcbfe 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -13,7 +13,7 @@ /obj/item/weapon/shield/riot name = "riot shield" - desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." + desc = "A shield adept at blocking blunt objects." icon = 'weapons.dmi' icon_state = "riot" flags = FPRINT | TABLEPASS| CONDUCT| ONBACK @@ -29,7 +29,7 @@ IsShield() return 1 -/obj/item/weapon/sord +/*/obj/item/weapon/sord name = "SORD" desc = "This thing is so unspeakably shitty you are having a hard time even holding it." icon_state = "sord" @@ -37,11 +37,11 @@ flags = FPRINT | ONBELT | TABLEPASS force = 2 throwforce = 1 - w_class = 3 + w_class = 3 */ /obj/item/weapon/claymore name = "claymore" - desc = "what are you standing around staring at this for? get to killing!" + desc = "BLOOD FOR THE BLOOD GOD." //SKULLS FOR THE SKULL THRONE. --SkyMarshal icon_state = "claymore" item_state = "claymore" flags = FPRINT | ONBELT | TABLEPASS @@ -54,7 +54,7 @@ /obj/item/weapon/bodybag name = "body bag" - desc = "Bag mixed with a bit of body." + desc = "A bag used to deal with a corpse." icon = 'closet.dmi' icon_state = "bodybag" flags = FPRINT | TABLEPASS| CONDUCT @@ -170,7 +170,7 @@ /obj/item/weapon/melee/baton name = "Stun Baton" - desc = "A stun baton for hitting people with." + desc = "The police baton of the future." icon_state = "stunbaton" item_state = "baton" flags = FPRINT | ONBELT | TABLEPASS @@ -182,7 +182,7 @@ var/status = 0 origin_tech = "combat=2" -/obj/item/weapon/melee/chainofcommand +/*/obj/item/weapon/melee/chainofcommand name = "Chain of Command" desc = "The Captain is first and all other heads are last." icon_state = "chainofcommand" @@ -194,7 +194,7 @@ var/charges = 50.0 var/maximum_charges = 50.0 var/status = 1 - origin_tech = "combat=4" + origin_tech = "combat=4" */ /obj/item/weapon/melee/energy var/active = 0 @@ -214,7 +214,7 @@ /obj/item/weapon/melee/energy/sword var/color name = "energy sword" - desc = "May the force be within you." + desc = "It cuts AND cooks at the same time!." icon_state = "sword0" force = 3.0 throwforce = 5.0 @@ -272,7 +272,7 @@ icon_state = "soapnt" /obj/item/weapon/soap/deluxe - desc = "A deluxe Waffle Co. brand bar of soap. Smells of comdoms." + desc = "A deluxe Waffle Co. brand bar of soap." //What is this I don't even. "Smells of comdoms." --SkyMarshal icon_state = "soapdeluxe" /obj/item/weapon/soap/syndie @@ -443,7 +443,7 @@ data = "Clown Land" /obj/item/weapon/card/emag - desc = "An identification card. No shit. Seems to have some funny chip on it, though." + desc = "An identification card. Seems to have some funny chip on it, though." name = "identification card" icon_state = "emag" item_state = "card-id" @@ -451,7 +451,7 @@ /obj/item/weapon/card/id name = "identification card" - desc = "An identification card. No shit." + desc = "An identification card." icon_state = "id" item_state = "card-id" var/access = list() @@ -619,7 +619,7 @@ /obj/item/weapon/fireaxe // DEM AXES MAN, marker -Agouri icon_state = "fireaxe0" name = "Fire axe" - desc = "Truly, the tool of a madman. Who would possibly think to fight fire with an axe?" + desc = "A tool for breaking down those obstructions that stop you from fighting that fire." //Less ROBUST. --SkyMarshal force = 5 w_class = 4.0 flags = ONBACK @@ -629,7 +629,7 @@ /obj/item/weapon/cane name = "cane" - desc = "A cane used by a true gentlemen. Or a clown." + desc = "A cane used by a true gentlemen." icon = 'weapons.dmi' icon_state = "cane" flags = FPRINT | TABLEPASS| CONDUCT @@ -662,7 +662,7 @@ /obj/item/weapon/extinguisher name = "fire extinguisher" - desc = "Contains water....dangit..." + desc = "Contains water..." icon = 'items.dmi' icon_state = "fire_extinguisher0" var/last_use = 1.0 @@ -793,7 +793,7 @@ /obj/item/weapon/mop - desc = "The world of janitalia wouldn't be complete without a mop." + desc = "The world of the janitor wouldn't be complete without a mop." name = "mop" icon = 'janitor.dmi' icon_state = "mop" @@ -926,7 +926,7 @@ throw_range = 15 /obj/item/weapon/pen/sleepypen - desc = "It's a normal black ink pen with a sharp point and a carefully engraved \"Waffle Co.\"" + desc = "It's a normal black ink pen with a sharp point." flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER origin_tech = "materials=2;biotech=1;syndicate=7" @@ -1256,7 +1256,7 @@ /obj/item/weapon/kitchen/rollingpin name = "rolling pin" - desc = "Used to knock out the Bartender." + desc = "Used to flatten dough." icon_state = "rolling_pin" force = 8.0 throwforce = 10.0 @@ -1282,7 +1282,7 @@ name = "Butcher's Cleaver" icon = 'kitchen.dmi' icon_state = "butch" - desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." + desc = "A huge thing used for chopping and chopping up meat." flags = FPRINT | TABLEPASS | CONDUCT force = 15.0 w_class = 2.0 @@ -1510,6 +1510,13 @@ icon_state = "mousetraparmed" armed = 1 +/obj/item/weapon/dice/d4 // -- SkyMarshal + name = "d4" + desc = "A dice with four sides." + sides = 4 + icon_state = "d20" + item_state = "dice" + /obj/item/weapon/dice // -- TLE name = "d6" desc = "A dice with six sides." @@ -1517,6 +1524,20 @@ icon_state = "dice" item_state = "dice" +/obj/item/weapon/dice/d8 // -- SkyMarshal + name = "d8" + desc = "A dice with eight sides." + sides = 8 + icon_state = "d20" + item_state = "dice" + +/obj/item/weapon/dice/d12 // -- SkyMarshal + name = "d12" + desc = "A dice with twelve sides." + sides = 12 + icon_state = "d20" + item_state = "dice" + /obj/item/weapon/dice/d20 // -- TLE name = "d20" desc = "A dice with...hell that is many sides." diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 6cc9a07920c..726b1420b8d 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -2344,7 +2344,7 @@ "aTd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/crew_quarters/captain) "aTe" = (/obj/item/weapon/pinpointer,/obj/item/weapon/disk/nuclear,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "aTf" = (/obj/item/weapon/camera_test,/obj/item/weapon/storage/photo_album{pixel_y = -10},/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) -"aTg" = (/obj/machinery/recharger{pixel_y = 4},/obj/item/weapon/melee/chainofcommand,/obj/structure/table/woodentable,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) +"aTg" = (/obj/machinery/recharger{pixel_y = 4},/obj/structure/table/woodentable,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "aTh" = (/obj/machinery/ai_status_display{pixel_y = 32},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "aTi" = (/obj/machinery/requests_console{department = "Captain's Quarters"; departmentType = 5; pixel_y = 30},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "aTj" = (/obj/machinery/status_display{pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) From fda118e9ac8b23a7a79731301ff66586336d956a Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sun, 18 Dec 2011 03:20:54 -0700 Subject: [PATCH 6/7] Reworked emag again, new centcom id sprite, removed derpy flavor text. --- code/defines/obj.dm | 33 ++++++++++++++++---------------- code/defines/obj/closet.dm | 4 ++-- code/defines/obj/computer.dm | 2 +- code/defines/obj/decal.dm | 8 ++++---- code/defines/obj/door.dm | 2 +- code/defines/obj/machinery.dm | 19 ++++++++---------- code/defines/obj/storage.dm | 22 ++++++++++----------- code/defines/obj/toy.dm | 2 +- code/defines/obj/weapon.dm | 2 +- code/modules/admin/admin.dm | 35 ---------------------------------- icons/obj/card.dmi | Bin 4205 -> 4638 bytes 11 files changed, 45 insertions(+), 84 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 6d593d5dc22..5131f6d2a5c 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -103,7 +103,7 @@ var/mob/living/carbon/monkey/target = null /obj/effect/sign/securearea - desc = "A warning sign which reads 'SECURE AREA'. This obviously applies to a nun-Clown." + desc = "A warning sign which reads 'SECURE AREA'" name = "SECURE AREA" icon = 'decals.dmi' icon_state = "securearea" @@ -150,8 +150,8 @@ pixel_y = -1 /obj/effect/sign/fire - desc = "A warning sign which reads 'HOT! HOT! AAAH! I'M BURNING!'" - name = "HOT! HOT! AAAH! I'M BURNING!" + desc = "A warning sign which reads 'EXTREME TEMPERATURES'" + name = "EXTREME TEMPERATURES" icon = 'decals.dmi' icon_state = "fire" anchored = 1.0 @@ -212,7 +212,7 @@ del(src)*/ /obj/effect/sign/maltesefalcon1 //The sign is 64x32, so it needs two tiles. ;3 - desc = "The Maltese Falcon, Space Bar and Grill. Now with added monkey." + desc = "The Maltese Falcon, Space Bar and Grill." name = "The Maltese Falcon" icon = 'decals.dmi' icon_state = "maltesefalcon1" @@ -221,7 +221,7 @@ density = 0 /obj/effect/sign/maltesefalcon2 - desc = "The Maltese Falcon, Space Bar and Grill. Now with added monkey." + desc = "The Maltese Falcon, Space Bar and Grill." name = "The Maltese Falcon" icon = 'decals.dmi' icon_state = "maltesefalcon2" @@ -289,7 +289,7 @@ /obj/item/device/multitool name = "multitool" - desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." + desc = "Used for pulsing wires to test which to cut." icon_state = "multitool" flags = FPRINT | TABLEPASS| CONDUCT force = 5.0 @@ -297,7 +297,6 @@ throwforce = 5.0 throw_range = 15 throw_speed = 3 - desc = "You can use this on airlocks or APCs to try to hack them without cutting wires." m_amt = 50 g_amt = 20 origin_tech = "magnets=1;engineering=1" @@ -445,7 +444,7 @@ anchored =1 var/netnum = 0 name = "power cable" - desc = "A flexible superconducting cable for heavy-duty power transfer. Comes in clown colors now." + desc = "A flexible superconducting cable for heavy-duty power transfer." icon = 'power_cond_red.dmi' icon_state = "0-1" var/d1 = 0 @@ -473,7 +472,7 @@ /obj/structure/morgue name = "morgue" - desc = "Used to keep bodies in untill someone fetches them." + desc = "Used to keep bodies in until someone fetches them." icon = 'stationobjs.dmi' icon_state = "morgue1" density = 1 @@ -482,7 +481,7 @@ /obj/structure/crematorium name = "crematorium" - desc = "A human incinerator. Works well on barbeque nights." + desc = "An incinerator." icon = 'stationobjs.dmi' icon_state = "crema1" density = 1 @@ -494,7 +493,7 @@ /obj/effect/mine name = "Mine" - desc = "I Better stay away from that thing." + desc = "I'd better stay away from that thing." density = 1 anchored = 1 layer = 3 @@ -544,7 +543,7 @@ /obj/effect/portal name = "portal" - desc = "Looks unstable. Best to test it with the clown." + desc = "Looks unstable." icon = 'stationobjs.dmi' icon_state = "portal" density = 1 @@ -610,7 +609,7 @@ /obj/structure/stool/chair/e_chair name = "electrified chair" - desc = "Looks absolutely SHOCKING!" + desc = "Looks absolutely terrifying!" icon_state = "e_chair0" var/atom/movable/overlay/overl = null var/on = 0.0 @@ -811,7 +810,7 @@ //BEGIN BRAINS===================================================== /obj/item/brain name = "brain" - desc = "A piece of juicy meat found in a persons head." + desc = "A piece of complex biomass found in a persons head." icon = 'surgery.dmi' icon_state = "brain2" flags = TABLEPASS @@ -902,7 +901,7 @@ name = "desk clutter" icon = 'items.dmi' icon_state = "deskclutter" - desc = "Some clutter the detective has accumalated over the years..." + desc = "Some clutter the desk has accumulated over the years..." anchored = 1 /obj/item/mouse_drag_pointer = MOUSE_ACTIVE_POINTER @@ -979,7 +978,7 @@ /obj/item/stack/rods name = "metal rods" - desc = "Some rods. Can be used for building, or something." + desc = "Some rods. Can be used for building." singular_name = "metal rod" icon_state = "rods" flags = FPRINT | TABLEPASS| CONDUCT @@ -1023,7 +1022,7 @@ /obj/item/stack/sheet/glass name = "glass" - desc = "HOLY HELL! That is a lot of glass." + desc = "That is a lot of glass." singular_name = "glass sheet" icon_state = "sheet-glass" g_amt = 3750 diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index 83236ad526f..de716390ede 100644 --- a/code/defines/obj/closet.dm +++ b/code/defines/obj/closet.dm @@ -15,7 +15,7 @@ /obj/structure/closet/acloset name = "Strange closet" - desc = "It looks alien!" + desc = "It looks weird!" icon_state = "acloset" icon_closed = "acloset" icon_opened = "aclosetopen" @@ -75,7 +75,7 @@ /obj/structure/closet/fireaxecabinet name = "Fire Axe Cabinet" - desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if." + desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe." var/obj/item/weapon/fireaxe/fireaxe = new/obj/item/weapon/fireaxe icon_state = "fireaxe1000" icon_closed = "fireaxe1000" diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm index ae0494b855d..316972013a0 100644 --- a/code/defines/obj/computer.dm +++ b/code/defines/obj/computer.dm @@ -152,7 +152,7 @@ /obj/machinery/computer/pod name = "Pod Launch Control" - desc = "A controll for launching pods. Some people prefer firing Mechas." + desc = "A controll for launching pods." icon_state = "computer_generic" var/id = 1.0 var/obj/machinery/mass_driver/connected = null diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm index 73760141614..eea0a6f926d 100644 --- a/code/defines/obj/decal.dm +++ b/code/defines/obj/decal.dm @@ -28,7 +28,7 @@ /obj/effect/decal/point name = "point" - desc = "It is an arrow hanging in mid-air. There may be a wizard about." + desc = "It is an arrow hanging in mid-air." icon = 'screen1.dmi' icon_state = "arrow" layer = 16.0 @@ -41,7 +41,7 @@ /obj/effect/decal/cleanable/blood name = "Blood" - desc = "It's red. Its Gooye. It is the chefs cooking perhaps." + desc = "It's red and disgusting." density = 0 anchored = 1 layer = 2 @@ -94,7 +94,7 @@ /obj/effect/decal/cleanable/xenoblood name = "xeno blood" - desc = "It's green. Must be more of the chefs cooking." + desc = "It's green. What the hell?" density = 0 anchored = 1 layer = 2 @@ -242,7 +242,7 @@ //Vomit (sorry) /obj/effect/decal/cleanable/vomit name = "Vomit" - desc = "Gosh, how unpleasant." + desc = "Geez, unpleasant." density = 0 anchored = 1 layer = 2 diff --git a/code/defines/obj/door.dm b/code/defines/obj/door.dm index 71d2ebd57b2..4b8d10feafb 100644 --- a/code/defines/obj/door.dm +++ b/code/defines/obj/door.dm @@ -33,7 +33,7 @@ /obj/machinery/door/poddoor name = "Podlock" - desc = "Why it no open!!!" + desc = "A type of powerful blast door." icon = 'rapid_pdoor.dmi' icon_state = "pdoor1" var/id = 1.0 diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index c4619699d03..15dbf0a4ab4 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -44,7 +44,7 @@ /obj/machinery/camera name = "Security Camera" - desc = "This is used to monitor rooms. Can see through walls." + desc = "This is used to monitor rooms." icon = 'monitors.dmi' icon_state = "camera" var/network = "SS13" @@ -61,7 +61,7 @@ active_power_usage = 10 /obj/machinery/dispenser - desc = "A simple yet bulky one-way storage device for gas tanks. Holds 10 plasma and 10 oxygen tanks." + desc = "A simple yet bulky one-way storage device for gas tanks. Holds plasma and oxygen tanks." name = "Tank Storage Unit" icon = 'objects.dmi' icon_state = "dispenser" @@ -101,7 +101,7 @@ /obj/machinery/firealarm name = "Fire Alarm" - desc = "Pull this in case of emergency. Thus keep pulling this forever." + desc = "Pull this in case of emergency." icon = 'monitors.dmi' icon_state = "fire0" var/detecting = 1.0 @@ -133,7 +133,7 @@ /obj/machinery/igniter name = "igniter" - desc = "Fun for igniting plasma." + desc = "Might as well make that detonator, right?" icon = 'stationobjs.dmi' icon_state = "igniter1" var/id = null @@ -198,7 +198,7 @@ /obj/machinery/scan_console name = "DNA Scanner Access Console" - desc = "Scand DNA." + desc = "Scan DNA." icon = 'computer.dmi' icon_state = "scanner" density = 1 @@ -220,7 +220,7 @@ /obj/machinery/scan_consolenew name = "DNA Modifier Access Console" - desc = "Scand DNA." + desc = "Scan DNA." icon = 'computer.dmi' icon_state = "scanner" density = 1 @@ -258,7 +258,6 @@ /obj/machinery/door_control name = "Remote Door Control" - desc = "This controls doors." icon = 'stationobjs.dmi' icon_state = "doorctrl0" desc = "A remote control switch for a door." @@ -270,7 +269,6 @@ /obj/machinery/driver_button name = "Mass Driver Button" - desc = "FIRE AWAY!" icon = 'objects.dmi' icon_state = "launcherbtt" desc = "A remote control switch for a Mass Driver." @@ -283,7 +281,6 @@ /obj/machinery/ignition_switch name = "Ignition Switch" - desc = "Activates that igniter." icon = 'objects.dmi' icon_state = "launcherbtt" desc = "A remote control switch for a mounted igniter." @@ -312,7 +309,7 @@ /obj/machinery/teleport/station name = "station" - desc = "The station thingy of a teleport thingy." + desc = "The station's hub of a teleport system." icon_state = "controller" var/active = 0 var/engaged = 0 @@ -378,7 +375,7 @@ /obj/machinery/power/monitor name = "Power Monitoring Computer" - desc = "Used to monitor the power. Pretty useless." + desc = "Used to monitor the power." icon = 'computer.dmi' icon_state = "power" density = 1 diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 7e60232d335..7a4a6a2209e 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -14,7 +14,7 @@ /obj/item/weapon/storage/trashbag name = "trash bag" - desc = "for picking up all those pens" + desc = "For picking up all that trash..." icon_state = "trashbag" item_state = "trashbag" w_class = 4.0 @@ -31,7 +31,7 @@ */ /obj/item/weapon/storage/pill_bottle name = "pill bottle" - desc = "This is told to hold untold horrors of pulls." + desc = "A reasonable place to put your pills.." icon_state = "pill_canister" icon = 'chemical.dmi' item_state = "contsolid" @@ -69,7 +69,7 @@ item_state = "syringe_kit" /obj/item/weapon/storage/backpack/clown - name = "Giggles Von Honkerton" + name = "clown's backpack" desc = "The backpack made by Honk. Co." icon_state = "clownpack" @@ -100,7 +100,7 @@ /obj/item/weapon/storage/briefcase name = "briefcase" - desc = "Used by the lawyer to robust security in the court room." + desc = "Used by the lawyer in the court room." icon_state = "briefcase" flags = FPRINT | TABLEPASS| CONDUCT force = 8.0 @@ -136,7 +136,7 @@ /obj/item/weapon/storage/firstaid/fire name = "Fire First Aid" - desc = "A kit for when you 'accidently' set toxins on fire and burn yourself." + desc = "A kit for when you accidently burn yourself." icon_state = "ointment" item_state = "firstaid-ointment" @@ -151,13 +151,13 @@ /obj/item/weapon/storage/firstaid/toxin name = "Toxin First Aid" - desc = "Used to treat when you have a high amoutn of toxins in your body." + desc = "Used to treat when you have a high amount of toxins in your body." icon_state = "antitoxin" item_state = "firstaid-toxin" /obj/item/weapon/storage/firstaid/o2 name = "Oxygen Deprivation First Aid" - desc = "A box full of oxygen goodies." + desc = "A box full of oxygenating goodies." icon_state = "o2" item_state = "firstaid-o2" @@ -189,7 +189,7 @@ /obj/item/weapon/storage/id_kit name = "Spare IDs" - desc = "Has so many empty IDs." + desc = "Has so many blank IDs." icon_state = "id" item_state = "syringe_kit" @@ -201,13 +201,13 @@ /obj/item/weapon/storage/injectbox name = "DNA-Injectors" - desc = "This box contains injectors it seems." + desc = "This box contains injectors, it seems." icon_state = "box" item_state = "syringe_kit" /obj/item/weapon/storage/stma_kit name = "Sterile Masks" - desc = "This box contains masks of sterility." + desc = "This box contains masks of +2 constitution." //I made it better. --SkyMarshal icon_state = "latex" item_state = "syringe_kit" @@ -225,7 +225,7 @@ /obj/item/weapon/storage/toolbox name = "toolbox" - desc = "Danger. Very robust." + desc = "Danger. Very heavy." icon = 'storage.dmi' icon_state = "red" item_state = "toolbox_red" diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm index 8be79927c6c..ee4e47ab1c8 100644 --- a/code/defines/obj/toy.dm +++ b/code/defines/obj/toy.dm @@ -241,7 +241,7 @@ /obj/item/toy/crayonbox name = "box of crayons" - desc = "A box of crayons for all your rune drawing needs." + desc = "A box of crayons for all your drawing needs." icon = 'crayons.dmi' icon_state = "crayonbox" w_class = 2.0 diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index b326f0fcbfe..5eded119f93 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -444,7 +444,7 @@ /obj/item/weapon/card/emag desc = "An identification card. Seems to have some funny chip on it, though." - name = "identification card" + name = "modified identification card" icon_state = "emag" item_state = "card-id" origin_tech = "magnets=2;syndicate=2" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index e1227e6eb45..b676da8ffbd 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -727,40 +727,6 @@ 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"]) @@ -1808,7 +1774,6 @@ foo += text("Prison | ") // foo += text("Maze | ") foo += text("Heal/Revive | ") - foo += text("Defensize | ") else foo += text("Hasn't Entered Game | ") foo += text("Forcesay | ") diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index aa88951b244b6b5ff21aa6eb243494fdd457275d..7435036350c09438e5c53ee6ab553a0464e5be42 100644 GIT binary patch literal 4638 zcmZ{IS5y;RuysP{H58>u?;-}IgGiAoU8D#|s3JrNDpe^FktS72=z)lW0R*IXq$AR# z*9ZuqV`!lSxcUCI{)hW;ANDyf=j@p?>&%{66Jutg$3V+P3jhEZ4D_`hl6J@cKut+n zmooyCNL%LXM>f9NZm(QkdieNyz`X&0z?`(9O4<%-w)acQL9vESh9%z~3+vpeF6S?3 zFut8pEzBMg5*40Z=#7hlD@n~qHf3rg>b6R=+p>z+=c!06{#8PR4?K=V`~~fqPu~d- z?|EDs&zA5KNYTP(Sj$Yf(D{q$Dj!zKlEF9k^fEV@?Pt^(#WaQaK)X50)L$PVVNMxx z>!W>4t!FTi-v@r2006UwfwtzOz?_}jH@=ofX}#(=jE+b33P@@lt)b7K&Mf4UksMDr#1mb8n;C=|9%hB>_jQ8bnL7CY zj+XkHhb6w)S0&`U8g6OW8{patC@X!nrz{q*hYh$o-t#+#^L4MjOx7U&iLN8V`U=y7 z-Tyzd7XTC#6zKeX4Q;!jhSJV(=OP=k?dr60Z5W#{T~1~ujfR((RC((ehUJF;-kC4%N>>ORkF~FsuyyeoC5_*pV zAV7}6pfNXFT3U><&6zP6GFyiES}$&HMejI$hPXP$)@Woso^t18==QL32|M`?@cYOCZw6I+ z5H7cbo)AKq7EA zAnvLyIymaI^CqEC5WoZ8TlmJ>qrox&@$eWW7~%MD_1%l6g9*AI9&pRP9!zra;X@V% z28Ku0))tnQt96vNet;7fJ2gNr0Y&aOGCkl2@6*q{Va~H1nes_a-l&V)=`i9$%GtfW zv4l@iZ+250{;UFfw8V-;wz}v94!PjMt&JEi9rKK2wRd*#CQFOW>E2SCS~3ChSoFGA zIa=H|AYcm>@&n1}DC&?uvAz<+Y})gsjpr7R89mPOweRU;hR?qVTzN%r*EJ+BloiDlhV?RL2gs1a%jAFpC zGya{gY=A7oIf*7W8303B)6o?xH5=RFWg#VEAnV(2KQqfT0c(01{V0lV6DP$tPg?a= zhr;IPsC6H;e&xB^VA)wu3@mpl_SMrdS290=M>AFK%CEP@_2v?f z4V!Zr36BN^cQ)9-TIXYD_B@=QL@lrwh6;75%cQl>UOt>YKYtvJmAg1Uh@9LOuW%pE zL--{_?lG`an=6h?0fMY2blFb^v6iht?7#)P(u z7Yz1aIv(oVC3Ph2yK<0W%sieg3Av&vFqqspC7g3_DaN#d?*3Gd2*1?nA`TA(xY_JW%8U?fv&I(PW%CilX{#cCTH+~j)KKbIbDG%X=1%8U>p;$I^oX9|Dyo^!R=QBdq9Yc1 zsAxZt4ie*pr1YFI?-rW*A9fj@*vF;FSCHgvXRhv(_=88Nr@1968otrUe@!=Xv$G`; z^=xPMqnbl>g2v6-<7hz^YWkS=QY9fL#QzOZ%4qlC*0BvXlcJF4mks>t7}=%39^Blu z+11#gms(2uLapk6Wo{H)D$w0sY++%+K48Jm9LW<)jOJ>G2DcJ(NQTjs6;Gw=<&Kfi zP>)72TL&z!? z7ZwI9oH`MGhZGn6ijlr&DSRKPY_hXPr!rR#upw7Gq3YhMTPc%zckiilESDwKNauVJ z=U4_M^Q8h^gD=OwS{UP)_>_L(5=`YOdWneawlF&NEB^%ET>6YG0mK}P`hqE123Rba(g_=Hn8F6w?WPxuj8 z*nX~wSdZxZH0{aniJRDR;P&#t9FvD;;>Q!!;Wj!%I>An#C*{F{fN?=h%G4%r#k1t= zZq~N84@^xHcPVCOW;(2cLknY&4nF-NNOIq>|M-eF#2H3W>^7@&|Hbf<0KO%+b+UKJG+Fgq4wx1OYtl{wrxQN zYZac&*J>&MT|+^G!(JFIAMDI7+pxgJ!VcC3&6BZkU*G1HgB9}?7YS?;FwTJ=$>_|9 zg20?eDF=SD>>`5QvmI#wqxfLUE>dk+syq0EVdMa)QuLnHKI=JXIZoTrDkoW5<9~rU zZKUf8k|dDc8O2moQ2|E${P{pdMMbc7EsY~`nMRQJUa*pcgv1w^fq}vHLKC|H`ATo% zl$dK;T3U5&ZDh^7gP9q>peF*(^D0)>y2rhP?Phw*Ww`X0HX}n>y%Qc4U+TI!FWXcj zW8>8hI!NL7?;qFJ)wf4c9GM6>a2BJ>{xSeLbWDby=6;{dI=WOcuf>-yH=5wM@V zBbB(P#3l1?$lZqhnoINJRhf$k{(xducJ*6nYuuNWcKMtByw1;U0SPyhm)#=#wkBiZdmSbo zqMY5zgB57fq?j*TzuZho1LBQI|Nz@ z^$nG5O+Be#vY81epte^YRYX)C7@3;7|7m|aJ~cJxpGT@sW9%2Ej7meTWwy&j`av)g zlLUPO0|7O)Tny$W;EQqg7ieNJ&~;>2&qAFn|5dnuh|MSeTd$d{5~9#)^R!7TFTEJ- z>VXeibDX&jyj$cjvjwpIS#o zhiIgqU#IWg_0I&)DHSmdT=d8}nM9cH8tYj@!M4J}$^hNw)|Q8d$5PFdgQ{5MfF>t@D)Hid z7^HB$F2t+t2eoyppWDdk`DbGF*AFe<%1)Eh73;UXq`Y2)Ie`047T5(dyCjM)fCYc| zpla^&l0C!AbM8Y_uQO+Gz!fa5y@7-}cv+;hD~b#XSxr{fK}o)%ZL+qY0JZUg%ZL|s zq6-5Rx*XL(Nm$~Azii)aZ}Pic*rQ{ki%=I?;cR|{akc``rzJfOj) z3H!r!Y1!yvrIt2WMu)IhR)i0~teC#*;2F*9e%6s1XI04h#>Qx;Q2f3r>RuVQra4=} zPC%^QT3`_xshnR1ajoY#pyMpGJ~^O-df?rOBg;Vi5EfpF-`LnV^KI+LLlN$xGbnZr zBsc=>>h7LR?cwQ(ZfM{{oCZ8|i+iNC(SA`95>@)4!4-$q&u*L^=bL7RyjV^xdOE<>^4ATH zMrL)oybCvaf2(CFLc!bV(1&kk3>Ca@u;!g*yjj)%M*+8oY;8S~@J`RQBWA2#E5Uivtg-4grDL!GO>_04?**S%IeAO;buXK!idxDH6~CLD zoSdo6PD5CxKR!x_#0#+=PqoQZ*mv-=H&kHTrnzb_b*bVi4nfF^l zaU(4aU~Z>>CBg+6`y#Tq(dfACCu(FrU`UZc)$b$V`T`T6Tt zgS|Mna3%?Cy_5YhMHFm6P*gpg+A~a}bf3VzYAA#tH0PI<#S7^r04hVwUkS6C=T@DA z;)KxK+t0^@+G}eSNMed^RsUhlmFJ!p)Fa7YS{#%_ysguv8rFvQcxY8zIzb$$*)OSNrKQJ^312nNkmA)fj| zxkn~us*V`ey(f6a4LAQ1Jp(j>0WuG;VHfdCzc5!8EzuLlbMy1|GG4QCW84@P%4s`@ zM#(8plWSFCDd+wzp{jo#%vz54 z@-dHfey`S& zv_$Hc)S7IFZ01$YB!$AYM~0jte5G_Tc^U5o>lpE->G$a9`R|x>T$sZ?9cNgs6s0S6_jiCKP1K?=CcOIKf(!qYzkWJz^ zfk4R%q>d8;#mXxx3_H{hT0-XF!ta5w6e~dErZgaOaUSwza4?HPp(y+aQLAU$eRdS! zj3JD*8T^zrxVu$$rwEv6MDiiWt9f8o#|+Wt#iw%~$7K1z&JV*6laDKAuREB7=AtG4 zqzEcKtE`j-9wLz#g>cp(B)q?iO{5sE{o7Um0)5m^z^tkzRuTFPq8*sloeTMUqU2_t@TWdsne5*EjK@GqN>)~HL{Zx>X8NO# zTW11mb%S;d`mvbvy)UiQHTB4;)OZh_p8|!KBmQI zkun{wLtam#WsYli=JP?E5dGe5Vu2N$dppe(sXm7KywNHa<##uXHx3kAI18nx<8&Rn zSdT|c@9gseQ77$#7>nV>QW5$mI*O(@j0~^v7dJL$AgezmOiejl_xshKZhwd?&WGfmnUwHJCa5Uzjjq~zC+Lx4+&~_{} z&GFdl*ltk!(}_D;2QSZ_<17Y>;}7&G?67T5tu#57^VeL5iw!wNm6fxmiOs?nrUZ>2 z=t}^LJ!!~8u?uCDWqL+mQv|Mg`S|FMDDqx*g0|!1SzwG$g4V{K(*R1#$hIBSX>L?3LrspAkTEo{%Umgc3%Xa15`yL0bVef{62H?hN(Z^jY-na+R zl(!=a!)F&t{<)c~%;jQ#=P7%v|6;E{;h4N)h7QimkdVPxh{au@I$xldlauR-lvJSr zHVYCF$q4ci3srTcdEtrhHgiZl*RN5e@fu*6x=aL`kB0ke zwW=%28bJCpuHAhyDOOn)7EVqnrQSC|Cl{B&zXK7XHx6AT;rUgU86n*l^BG)S7Deds z*$lSn83=I?cy5xd@*Rwa&L7YbRBl3%&@TDo1V_5`oSeSed!0b@75m%Mk&Q@5*)AF> zL?2H>{hWpIQm(Z@jbnrWA9`y}=i{RvOl!|UA?2y-t>$nKt0QK5cMSqx^dgIyg~oya z@KA^>2ufn0^x#ngbF>iKY5SJWh+@RAnQLP3zdV$Z+1a(7ZtB|lJNy&Zp6n*lI5BkG zW%?rGkzo1o9cTw7R+4pLLp1J6l1-OPSqBwMY+LNN^;8MmF-h#2rd(;g&nzIn#{f!^ z;OKs(^jW`4hk_*7zNbFiA7#%q19jT-AD@VE-yaym3PXZ}gErQrhN}*Dlx(Fa&S>%e(qcwe)0Y!A zs7q#DGI6YUB_$>I(-W!HsFI~wtttmRA0G~o!dO^Pjov@lVwMnbr5J;K7>gcMlf9*7 z=d(i>x3NWPi(d>_hY99|GeY>#zh|82!Nzg4f1ASuDaxZ}u`QlG(1o^Pdhb-GJ)YP}ynu z6X3OW&lYWN5A4%Ypib0*29d5d>Nw)6|AHPY{q<|_^97)0=*MkmBg4fXH$yh280M%q z&Pl>OG!#2U5g0^SUHf@@FHf6Yv%M~viA=HndW>g&c#lfdrr(m6+L)fTH4mad{>|+y zUG%|GEMhX#;y(jS@dl+Y>+p5l{~n?mvToPMRU)h&A{v*3O-tkUfFp2Qs&Hjgt`&TJ zlVwH>bnd9*f9K%p<0CiSeCpu=jOGey; z2czq50IUCB{ow)9FwD`t1`O?P#dLF5Eg)O`|CXm>`gUV<8-bV=g=@WzyEbuqIj=U0 ziozyWSDTrrUJyB~u3-cGNR&5xzh=N06JukRGfd}9nm6p$v4YY2dz4kQvva6Kl{1{0ugJzHU%M8P<# zELYW*l*A*@RA4iOL3mQxSZ%rEIKN1o^=QuP|RTXX@zUCz@p z!lQo!CB9$896h|0CZahNaHMw(YuiGXs;jt)cM{Kc$k*g}mA!-*E7NbapJDsrwMW@z z2Rm7n^-#VV`vXQCB<#p1W)24JmE9XpnI?uD7~5Z9U26Gr_6EcOn^1eeje$Edd&_6-(-|^ zuB=$+m9=XxG0sYn<=2X82^wC)nznq4-JHeV3W~b5e;kGTW6kikNEX`YC-iR&T@Da# zi9Y83z zM$r#d@B!cmcum-JWQ(%*V&u(@#IvuPM}S!^zD^5 zr@5f%^GL4laY`ElTDOyStFv5Df@#<3t~?kO`Q|0sIi9mP<=vAa(CKsRmuy@Bm$@(T z3-;!B&Y8Ed_oCocXk$Qk96D2R*Eo;pn2MzC;6QlmUTn824UhXlgk_KSe@4P0bKiBnB$zB3>Eav)|@RQzP1r;x&Sl-B00&P3J(lNmX58`q1;1)lz@ zsF6}r|HcFJ3C4EA0vE-1m!xO}Yg2jMH9bja@V3-l4=qdGcPJq0C*Lkb_X4l#wKLAW zct2=cRr~3afB|Cr>j#3bT-mi{aQCGt>cd9pfp!lP-6qW@o^#+ndAo{ji(l$q=KnD} z&Vb7;-qyiFQtE-VwY4tNk%56>c-MQG>6TWynUUI1sJH)`NSDlo*LkT%9lJn_%V}Fs zWWk`9yCQR12%6jL2vcmRoiE%ZKh3nl1-la#CX<0L>&`>Ztp0wJSwyYt#C;T^;0H82RVjWlSP6JoOL56gmCM2J5t{%?3BPDeoTDC%;&HauGQ3nH`Xwp_j9qTj!?ii2^vza8a#ici86VcF6b zz)a$=m1nWCrGUx?p#bqfKo^=IJ`X~};%A9AjX@}z-$~^xI}xWR?nSLD^^Qpo(b{jx zMDho5U_O~8OV*wa)D92-WYVQ|x>C!HNjW}T;u~z5*sByD>KHEn{8{az@9Z}rzZQ;0 z^t%jw_D(9$L?+ty@^Disu$9*hpo~xM$oT|F!)TwA+Bc0UtW^(8nj;h>S8oG$e3>Xe z;VgNVnhdn=JYAXLLw%0|CmhyBZsdR+I~Ss-zfzZ=MtGjClASNH z&;BAb6L`e``RK09Zfq#Zfza-ake&w0tnx{jVDM?wkfr?w0gOr)nay5YPZv5dsiA37GE~TBp!Hrl3IH>n+KXE}AP5t^w04Fz;kkWEmPCyAc?FRPNlWp$PnQkei|Jz4Uqr_W^*t)$ zfQ5-f>kT|^d8HR8_TuW#T|ivWS-x%+3X&nq>j&WI5&gIv&ssk~Yliw}deyqFvHt}t C Date: Sun, 18 Dec 2011 13:05:18 +0200 Subject: [PATCH 7/7] Fixed a spelling mistake. --- code/defines/obj/computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm index 316972013a0..082c8381839 100644 --- a/code/defines/obj/computer.dm +++ b/code/defines/obj/computer.dm @@ -152,7 +152,7 @@ /obj/machinery/computer/pod name = "Pod Launch Control" - desc = "A controll for launching pods." + desc = "A control for launching pods." icon_state = "computer_generic" var/id = 1.0 var/obj/machinery/mass_driver/connected = null