diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index d05d407f36..1d6d7e5d4e 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -714,23 +714,23 @@
flags = FPRINT | TABLEPASS | CONDUCT
throwforce = 0
w_class = 3.0
- throw_speed = 2
- throw_range = 0 //cannot be thrown
origin_tech = "materials=1"
- var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute
+ var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute
/obj/item/weapon/legcuffs/beartrap
name = "bear trap"
- icon_state = "beartrap"
+ throw_speed = 2
+ throw_range = 1
+ icon_state = "beartrap0"
desc = "A trap used to catch bears and other legged creatures."
- breakouttime = 300 //Deciseconds = 30s = 0.5 minute
var/armed = 0
-/obj/item/weapon/legcuffs/beartrap/attack_self()
+/obj/item/weapon/legcuffs/beartrap/attack_self(mob/user as mob)
..()
- if(ishuman(usr) && !usr.stat && !usr.restrained())
+ if(ishuman(user) && !user.stat && !user.restrained())
armed = !armed
- usr << "\blue \the [src] is now [(armed)?"armed":"disarmed"]"
+ icon_state = "beartrap[armed]"
+ user << "[src] is now [armed ? "armed" : "disarmed"]"
/obj/item/weapon/legcuffs/beartrap/HasEntered(AM as mob|obj)
if(armed)
diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm
index 95d4f82b95..e5b8732c26 100644
--- a/code/game/jobs/job/civilian_chaplain.dm
+++ b/code/game/jobs/job/civilian_chaplain.dm
@@ -15,8 +15,8 @@
var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible/booze(H)
H.equip_to_slot_or_del(B, slot_l_hand)
- H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
spawn(0)
var/religion_name = "Christianity"
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index db8bfa183a..307daa5672 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -243,7 +243,7 @@
/obj/structure/table/attack_paw(mob/user as mob)
if ((HULK in usr.mutations))
usr << "\blue You destroy the table."
- usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
visible_message("\red [user] smashes the table apart!")
if(istype(src, /obj/structure/table/reinforced))
new /obj/item/weapon/table_parts/reinforced( src.loc )
@@ -297,7 +297,7 @@
if ((HULK in usr.mutations) || (SUPRSTR in usr.augmentations))
usr << "\blue You destroy the table."
visible_message("\red [user] smahes the table apart!")
- usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
if(istype(src, /obj/structure/table/reinforced))
new /obj/item/weapon/table_parts/reinforced( src.loc )
else if(istype(src, /obj/structure/table/woodentable))
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 8674e54ef0..82e9cbad9d 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -99,7 +99,7 @@
/obj/structure/window/attack_hand(mob/user as mob)
if((HULK in user.mutations) || (SUPRSTR in user.augmentations))
- user.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
+ user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
user.visible_message("[user] smashes through [src]!")
new /obj/item/weapon/shard(loc)
if(reinf) new /obj/item/stack/rods(loc)
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 839c04a2ee..cb43e19959 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -91,7 +91,7 @@
if ((HULK in user.mutations))
if (prob(40))
usr << text("\blue You smash through the wall.")
- usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
dismantle_wall(1)
return
else
@@ -122,7 +122,7 @@
if ((HULK in user.mutations) || (SUPRSTR in user.augmentations))
if (prob(40))
usr << text("\blue You smash through the wall.")
- usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
dismantle_wall(1)
return
else
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 5cd0a29d5c..f72f135dcf 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -13,7 +13,7 @@
if ((HULK in user.mutations) || (SUPRSTR in user.augmentations))
if (prob(10))
usr << text("\blue You smash through the wall.")
- usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
dismantle_wall(1)
return
else
diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm
index 35feea6466..be9d08b530 100644
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -634,7 +634,7 @@
CM.next_move = world.time + 100
CM.last_special = world.time + 100
if(isalienadult(CM) || (HULK in usr.mutations) || (SUPRSTR in CM.augmentations))//Don't want to do a lot of logic gating here.
- usr << "\green You attempt to break your handcuffs. (This will take around 5 seconds and you need to stand still)"
+ usr << "\red You attempt to break your handcuffs. (This will take around 5 seconds and you need to stand still)"
for(var/mob/O in viewers(CM))
O.show_message(text("\red [] is trying to break the handcuffs!", CM), 1)
spawn(0)
@@ -643,8 +643,8 @@
return
for(var/mob/O in viewers(CM))
O.show_message(text("\red [] manages to break the handcuffs!", CM), 1)
- CM << "\green You successfully break your handcuffs."
- CM.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ CM << "\red You successfully break your handcuffs."
+ CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
del(CM.handcuffed)
CM.handcuffed = null
CM.update_inv_handcuffed()
@@ -672,7 +672,7 @@
CM.next_move = world.time + 100
CM.last_special = world.time + 100
if(isalienadult(CM) || (HULK in usr.mutations) || (SUPRSTR in CM.augmentations))//Don't want to do a lot of logic gating here.
- usr << "\green You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)"
+ usr << "\red You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)"
for(var/mob/O in viewers(CM))
O.show_message(text("\red [] is trying to break the legcuffs!", CM), 1)
spawn(0)
@@ -681,8 +681,8 @@
return
for(var/mob/O in viewers(CM))
O.show_message(text("\red [] manages to break the legcuffs!", CM), 1)
- CM << "\green You successfully break your legcuffs."
- CM.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ CM << "\red You successfully break your legcuffs."
+ CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
del(CM.legcuffed)
CM.legcuffed = null
CM.update_inv_legcuffed()
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index f31bfa1b7d..f41c8600ce 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ