diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index cad8f8518db..4eef830f1b4 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -728,7 +728,7 @@ client
if(!src.holder)
usr << "You are not an administrator."
return
- var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","metroid","plant")
+ var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","metroid","plant","tajaran","skrell") //BS12 EDIT TAJ EDIT SKR
switch(new_mutantrace)
if(null) return
if("NONE") new_mutantrace = ""
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index ceca81f2858..a3eddf60dc3 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -196,7 +196,7 @@
return dat
/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 = 'icons/obj/decals.dmi'
icon_state = "securearea"
@@ -943,7 +943,7 @@
/obj/effect/portal
name = "portal"
- desc = "Looks unstable. Best to test it with the clown."
+ desc = "Looks unstable."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "portal"
density = 1
diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm
index 90d765dd91d..c6acfc3a5ac 100644
--- a/code/defines/obj/hydro.dm
+++ b/code/defines/obj/hydro.dm
@@ -162,7 +162,7 @@
/obj/item/seeds/bananaseed
name = "pack of banana seeds"
- desc = "They're seeds that grow into banana trees. When grown, keep away from clown."
+ desc = "They're seeds that grow into banana trees."
icon_state = "seed-banana"
mypath = "/obj/item/seeds/bananaseed"
species = "banana"
diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index 9d2fb25d00f..81cb7a4268d 100755
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -146,7 +146,8 @@
cost = 10
containertype = "/obj/structure/closet/crate"
containername = "Replacement lights"
-
+//BS12 EDIT
+/*
/datum/supply_packs/costume
name = "Standard Costume crate"
contains = list("/obj/item/weapon/storage/backpack/clown",
@@ -165,7 +166,7 @@
containertype = "/obj/structure/closet/crate/secure"
containername = "Standard Costumes"
access = access_theatre
-
+*/
/datum/supply_packs/wizard
name = "Wizard costume"
contains = list("/obj/item/weapon/staff",
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 2971fad009d..2227405d5c5 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -665,7 +665,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 = 'icons/obj/weapons.dmi'
icon_state = "cane"
item_state = "cane"
@@ -1398,7 +1398,7 @@
name = "butcher's Cleaver"
icon = 'icons/obj/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
diff --git a/code/defines/turf.dm b/code/defines/turf.dm
index 8138c28245a..bcc45149848 100644
--- a/code/defines/turf.dm
+++ b/code/defines/turf.dm
@@ -213,7 +213,7 @@
walltype = "plasma"
if("clown")
name = "bananium wall"
- desc = "A wall with bananium plating. Honk!"
+ desc = "A wall with bananium plating."
icon_state = "clown0"
walltype = "clown"
if("sandstone")
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index c92bedb091e..f8ee683d444 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -417,10 +417,10 @@
return "CMO Private"
if(access_qm)
return "Quartermaster's Office"
- if(access_clown)
+/* if(access_clown)
return "HONK! Access"
if(access_mime)
- return "Silent Access"
+ return "Silent Access"*/
if(access_surgery)
return "Surgery"
if(access_theatre)
@@ -481,7 +481,7 @@
/proc/get_all_jobs()
return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician",
- "Shaft Miner", "Clown", "Mime", "Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
+ "Shaft Miner", /*"Clown", "Mime", */"Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
"Atmospheric Technician", "Roboticist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
"Research Director", "Scientist", "Head of Security", "Warden", "Detective", "Security Officer")
diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index 9ce9e5f9a64..27b6d5e82a1 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -161,7 +161,8 @@
-//Griff
+//Griff //BS12 EDIT
+/*
/datum/job/clown
title = "Clown"
flag = CLOWN
@@ -227,7 +228,7 @@
H.mind.special_verbs += /client/proc/mimewall
H.miming = 1
return 1
-
+*/
/datum/job/janitor
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index fdfb0468b14..6b046292a35 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -320,16 +320,16 @@ var/global/datum/controller/occupations/job_master
return 1
if("AI","Clown") //don't need bag preference stuff!
else
- switch(H.backbag)
+ switch(H.backbag) //BS12 EDIT
if(1)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
if(2)
var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H)
- new /obj/item/weapon/storage/box/survival(BPK)
+ new /obj/item/weapon/storage/box(BPK)
H.equip_to_slot_or_del(BPK, slot_back,1)
if(3)
var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel_norm(H)
- new /obj/item/weapon/storage/box/survival(BPK)
+ new /obj/item/weapon/storage/box(BPK)
H.equip_to_slot_or_del(BPK, slot_back,1)
H << "You are the [rank]."
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index a587472d74a..892c2c20306 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -87,7 +87,7 @@ var/list/science_positions = list(
"Roboticist" //Part of both engineering and science
)
-
+//BS12 EDIT
var/list/civilian_positions = list(
"Head of Personnel",
"Bartender",
@@ -100,8 +100,6 @@ var/list/civilian_positions = list(
"Shaft Miner",
"Lawyer",
"Chaplain",
- "Clown",
- "Mime",
"Assistant"
)
diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm
index 7e89ea5e08a..bcdb3ac6b29 100644
--- a/code/game/machinery/OpTable.dm
+++ b/code/game/machinery/OpTable.dm
@@ -1,6 +1,6 @@
/obj/machinery/optable
name = "Operating Table"
- desc = "Used for advanced medical procedures. Apparently this includes the clown."
+ desc = "Used for advanced medical procedures."
icon = 'icons/obj/surgery.dmi'
icon_state = "table2-idle"
density = 1
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index 62aa9fe2777..746ead8c643 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -92,7 +92,7 @@
shot_delay = 6//Longer shot delay because JESUS CHRIST
check_records = 0//Don't actively target people set to arrest
arrest_type = 1//Don't even try to cuff
- req_access = list(access_maint_tunnels,access_clown,access_mime)
+ req_access = list(access_maint_tunnels)
arrest_type = 1
if((lasercolor == "b") && (name == "ED-209 Security Robot"))//Picks a name if there isn't already a custome one
name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index 6ee6feebe6a..f4a07ca6812 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -499,7 +499,7 @@
for(var/obj/machinery/message_server/server in message_servers)
if(!isnull(server))
if(!isnull(server.decryptkey))
- info = "Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one."
+ info = "Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret.
If necessary, change the password to a more secure one."
info_links = info
overlays += "paper_words"
break
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 6552fbe7a58..3a46cef1404 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -300,7 +300,6 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
/obj/machinery/door/airlock/clown
name = "Bananium Airlock"
- desc = "Honkhonkhonk"
icon = 'icons/obj/doors/Doorbananium.dmi'
var/mineral = "clown"
doortype = 29
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 2e29a1ef45e..d3b244be295 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -445,8 +445,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
break // Another for to go through newscasters is not needed. Due to the nature of submit_new_CHANNEL, every reference
src.screen=4 // to a channel in ANY newscaster is the same. Editing one will edit them all.
- for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
- NEWSCASTER.newsAlert(src.channel_name)
+ for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+ NEWSCASTER.newsAlert(src.channel_name)
src.updateUsrDialog()
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index f16f1ee81e9..77e5c7763c9 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -81,7 +81,7 @@
iconholder = null
reqpower = 100
lasercolor = "b"
- req_access = list(access_maint_tunnels,access_clown,access_mime)
+ req_access = list(access_maint_tunnels)
check_records = 0
criminals = 0
auth_weapons = 1
@@ -95,7 +95,7 @@
iconholder = null
reqpower = 100
lasercolor = "r"
- req_access = list(access_maint_tunnels,access_clown,access_mime)
+ req_access = list(access_maint_tunnels)
check_records = 0
criminals = 0
auth_weapons = 1
diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm
index fa1a37f6032..f9d2061be1d 100644
--- a/code/game/objects/door_assembly.dm
+++ b/code/game/objects/door_assembly.dm
@@ -244,7 +244,6 @@ obj/structure/door_assembly
door_assembly_clown
name = "Bananium Airlock Assembly"
- desc = "Honk"
icon_state = "door_as_clown1"
airlock_type = /obj/machinery/door/airlock/clown
anchored = 1
@@ -467,7 +466,7 @@ obj/structure/door_assembly
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
if(do_after(user, 40))
- user << "\blue You installed bananium plating into the airlock assembly!HONK"
+ user << "\blue You installed bananium plating into the airlock assembly!"
G.use(2)
playsound(src.loc, 'sound/items/bikehorn.ogg', 15, 1, -3)
src.mineral = "clown"
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 972e842513d..3dda0ade939 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -204,7 +204,7 @@
////////////////////////////////////
/obj/item/weapon/dnainjector/anticough
name = "DNA-Injector (Anti-Cough)"
- desc = "Will stop that aweful noise."
+ desc = "Will stop that awful noise."
dnatype = "se"
dna = "708"
block = 5
@@ -218,7 +218,7 @@
/obj/item/weapon/dnainjector/clumsymut
name = "DNA-Injector (Clumsy)"
- desc = "Makes clown minions."
+ desc = "Makes clumsy minions."
dnatype = "se"
dna = "FA0"
//block = 6
@@ -228,7 +228,7 @@
/obj/item/weapon/dnainjector/anticlumsy
name = "DNA-Injector (Anti-Clumy)"
- desc = "Apply this for Security Clown."
+ desc = "Cleans up confusion."
dnatype = "se"
dna = "708"
//block = 6
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index e5e5d4059ae..5d67a68caca 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -211,7 +211,7 @@
This is pretty much vital for the process because without a body, you cannot clone it. Usually, bodies will be brought to you, so you do not need to worry so much about this step. If you already have a body, great! Move on to the next step.
Step 2: Strip body
- The cloning machine does not like abiotic items. What this means is you can’t clone anyone if they’re wearing clothes, so take all of it off. If it’s just one person, it’s courteous to put their possessions in the closet. If you have about seven people awaiting cloning, just leave the piles where they are, but don’t mix them around and for God’s sake don’t let the Clown in to steal them.
+ The cloning machine does not like abiotic items. What this means is you can’t clone anyone if they’re wearing clothes, so take all of it off. If it’s just one person, it’s courteous to put their possessions in the closet. If you have about seven people awaiting cloning, just leave the piles where they are, but don’t mix them around and for God’s sake don’t let people in to steal them.
Step 3: Put body in cloning machine
Grab the body and then put it inside the DNA modifier. If you cannot do this, then you messed up at Step 2. Go back and check you took EVERYTHING off - a commonly missed item is their headset.
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 5799aae9912..d86a0d51310 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -15,6 +15,15 @@ var/global/BSACooldown = 0
msg = dd_replacetext(msg, "%holder_ref%", "\ref[C.holder]")
C << msg
+/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
+ var/rendered = "ADMIN LOG: [text]"
+ log_adminwarn(rendered)
+ for (var/client/C in admin_list)
+ if (C)
+ if(!C.STFU_atklog)
+ var/msg = rendered
+ C << msg
+
/obj/admins/Topic(href, href_list)
..()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index f5b1e49a979..0022594ce60 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -742,6 +742,16 @@
usr << "You will now [STFU_radio ? "not hear" : "hear"] radio chatter from nearby radios or speakers"
feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/toggle_hear_atklog()
+ set name = "Toggle Hear Attacks"
+ set category = "Admin"
+
+ if(!holder) return
+ STFU_atklog = !STFU_atklog
+ usr << "You will now [STFU_atklog ? "not hear" : "hear"] attack logs"
+ feedback_add_details("admin_verb","THAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
/client/proc/deadmin_self()
set name = "De-admin self"
set category = "Admin"
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 4824c518f6e..b7abe30f7f8 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -3971,11 +3971,11 @@ var/list/grind_products = list()
if("bananahonk")
icon_state = "bananahonkglass"
name = "Banana Honk"
- desc = "A drink from Clown Heaven."
+ desc = "A drink from Banana Heaven."
if("silencer")
icon_state = "silencerglass"
name = "Silencer"
- desc = "A drink from mime Heaven."
+ desc = "A drink from silent Heaven."
if("nothing")
icon_state = "nothing"
name = "Nothing"
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
index 6fb651d918a..556743b1256 100644
--- a/code/modules/client/client defines.dm
+++ b/code/modules/client/client defines.dm
@@ -41,6 +41,7 @@
var/activeslot = 1 //Default active slot!
var/STFU_ghosts //80+ people rounds are fun to admin when text flies faster than airport security
var/STFU_radio //80+ people rounds are fun to admin when text flies faster than airport security
+ var/STFU_atklog
///////////////
//SOUND STUFF//
@@ -55,7 +56,7 @@
////////////
var/next_allowed_topic_time = 10
// comment out the line below when debugging locally to enable the options & messages menu
- control_freak = 1
+ //control_freak = 1
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 10337c38037..42eff94af4c 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -43,7 +43,7 @@
//Mime
/obj/item/clothing/head/beret
name = "beret"
- desc = "A beret, a mime's favorite headwear."
+ desc = "A beret, an artists favorite headwear."
icon_state = "beret"
flags = FPRINT | TABLEPASS
diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm
index d1a27521125..372d6cec183 100644
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -541,7 +541,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pie
name = "Banana Cream Pie"
- desc = "Just like back home, on clown planet! HONK!"
+ desc = "Just like back home!"
icon_state = "pie"
trash = /obj/item/trash/plate
@@ -1739,7 +1739,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
name = "Birthday Cake"
- desc = "Happy Birthday little clown..."
+ desc = "Happy Birthday..."
icon_state = "birthdaycake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
slices_num = 5
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index c32c1df5ca4..2ec678d6ab4 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -20,7 +20,8 @@
M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])")
-
+ log_admin("ATTACK: [M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])")
+ msg_admin_attack("ATTACK: [M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])") //BS12 EDIT ALG
log_attack("[M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])")
@@ -59,10 +60,10 @@
switch(M.a_intent)
if("help")
- if(health > 0)
+ if(health > config.health_threshold_crit)
help_shake_act(M)
return 1
- if(M.health < -75) return 0
+// if(M.health < -75) return 0
if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))
M << "\blue Remove your mask!"
@@ -112,7 +113,9 @@
M.attack_log += text("\[[time_stamp()]\] Used Electric Hands nanoaug power on [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] Has been shocked by [M.name] with the Electric Hands nanoaug ([M.ckey])")
- log_attack("[M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name], shocking them ([src.ckey])")
+ log_admin("ATTACK: [M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name] ([src.ckey]), shocking them")
+ msg_admin_attack("ATTACK: [M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name] ([src.ckey]), shocking them") //BS12 EDIT ALG
+ log_attack("[M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name]([src.ckey]), shocking them ")
var/armorblock = run_armor_check(M.zone_sel.selecting, "energy")
@@ -120,28 +123,32 @@
return
- M.attack_log += text("\[[time_stamp()]\] Punched [src.name] ([src.ckey])")
- src.attack_log += text("\[[time_stamp()]\] Has been punched by [M.name] ([M.ckey])")
-
- log_attack("[M.name] ([M.ckey]) punched [src.name] ([src.ckey])")
-
-
var/attack_verb
if(M.dna)
switch(M.dna.mutantrace)
if("lizard")
attack_verb = "scratch"
+ if("tajaran")
+ attack_verb = "scratch"
if("plant")
attack_verb = "slash"
else
attack_verb = "punch"
+ M.attack_log += text("\[[time_stamp()]\] [attack_verb]ed [src.name] ([src.ckey])")
+ src.attack_log += text("\[[time_stamp()]\] Has been [attack_verb]ed by [M.name] ([M.ckey])")
- var/damage = rand(0, 9)
+ log_admin("ATTACK: [M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])")
+ msg_admin_attack("ATTACK: [M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])") //BS12 EDIT ALG
+ log_attack("[M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])")
+
+ var/damage = rand(0, 5)//BS12 EDIT
if(!damage)
switch(attack_verb)
if("slash")
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
+ if("scratch")
+ playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
@@ -154,25 +161,28 @@
if(HULK in M.mutations) damage += 5
if(SUPRSTR in M.augmentations) damage += 5
+ if(attack_verb == "scratch") damage += 5
switch(attack_verb)
if("slash")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ if("scratch")
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
else
playsound(loc, "punch", 25, 1, -1)
visible_message("\red [M] has [attack_verb]ed [src]!")
apply_damage(damage, BRUTE, affecting, armor_block)
- if(damage >= 9)
+ if(damage >= 5 && prob(50))
visible_message("\red [M] has weakened [src]!")
- apply_effect(4, WEAKEN, armor_block)
+ apply_effect(2, WEAKEN, armor_block)
if("disarm")
M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])")
-
+ log_admin("ATTACK: [M.name] ([M.ckey]) disarmed [src.name] ([src.ckey])")
log_attack("[M.name] ([M.ckey]) disarmed [src.name] ([src.ckey])")
@@ -181,7 +191,7 @@
var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
var/randn = rand(1, 100)
if (randn <= 25)
- apply_effect(2, WEAKEN, run_armor_check(affecting, "melee"))
+ apply_effect(4, WEAKEN, run_armor_check(affecting, "melee"))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
visible_message("\red [M] has pushed [src]!")
return
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index e97971c5dbf..46c875a9f93 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -305,12 +305,17 @@ Please contact me on #coderbus IRC. ~Carn x
var/fat
if( FAT in mutations )
fat = "fat"
-
+ var/g = "m"
+ if (gender == FEMALE) g = "f"
+//BS12 EDIT
if(dna)
switch(dna.mutantrace)
- if("lizard","golem","metroid")
+ if("golem","metroid")
overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_l")
overlays_standing[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_s")
+ if("lizard", "tajaran", "skrell")
+ overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_[g]_l")
+ overlays_standing[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_[g]_s")
if("plant")
if(stat == DEAD) //TODO
overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_d")
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index b20bc5201e3..dbf3fd8a040 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -105,10 +105,10 @@
return
//if(icon_state == initial(icon_state))
- var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Clown", "Monochrome", "Blue", "Inverted", "Firewall", "Green", "Red", "Static")
- if(icontype == "Clown")
- icon_state = "ai-clown2"
- else if(icontype == "Monochrome")
+ var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Monochrome", "Blue", "Inverted", "Firewall", "Green", "Red", "Static")
+/* if(icontype == "Clown")
+ icon_state = "ai-clown2"*/
+ if(icontype == "Monochrome")
icon_state = "ai-mono"
else if(icontype == "Blue")
icon_state = "ai"
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 4b7e8ced480..f09750220c7 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -284,7 +284,7 @@
overlays += "paper_stamped_denied"
if(/obj/item/weapon/stamp/clown)
if (!clown)
- usr << "You are totally unable to use the stamp. HONK!"
+ usr << "You are unable to use the stamp."
return
else
overlays += "paper_stamped_clown"
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 07ecdcb710b..c5160c9a617 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -16,7 +16,7 @@
/obj/item/projectile/energy/declone
- name = "declown"
+ name = "declone"
icon_state = "declone"
nodamage = 1
damage_type = CLONE
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index ea32b5319da..2f151ec6fdb 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -3890,7 +3890,7 @@ datum
bananahonk
name = "Banana Mama"
id = "bananahonk"
- description = "A drink from Clown Heaven."
+ description = "A drink from Banana Heaven."
nutriment_factor = 1 * REAGENTS_METABOLISM
color = "#664300" // rgb: 102, 67, 0
@@ -3924,7 +3924,7 @@ datum
silencer
name = "Silencer"
id = "silencer"
- description = "A drink from Mime Heaven."
+ description = "A drink from Silent Heaven."
nutriment_factor = 1 * REAGENTS_METABOLISM
color = "#664300" // rgb: 102, 67, 0
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index e149c7c5237..dce8366c18d 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -369,7 +369,7 @@
if("bananahonk")
icon_state = "bananahonkglass"
name = "Banana Honk"
- desc = "A drink from Clown Heaven."
+ desc = "A drink from Banana Heaven."
if("silencer")
icon_state = "silencerglass"
name = "Silencer"
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index a94cc6d406b..2a41229be6f 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -1940,7 +1940,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
name = "Birthday Cake"
- desc = "Happy Birthday little clown..."
+ desc = "Happy Birthday..."
icon_state = "birthdaycake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
slices_num = 5
diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm
index 57d87150d00..488b59dd9bf 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm
@@ -426,7 +426,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/banana
seed = "/obj/item/seeds/bananaseed"
name = "banana"
- desc = "It's an excellent prop for a clown."
+ desc = "It's an excellent prop for a comedy."
icon = 'icons/obj/items.dmi'
icon_state = "banana"
item_state = "banana"