diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 837efbc0292..f5aa1fcf929 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -239,13 +239,14 @@
user << "\red You slash at the armored suit!"
for (var/mob/V in viewers(src))
if(V.client && !(V.blinded))
- V.show_message("The [user] slashes at [src.name]'s armor!", 1)
+ V.show_message("\red The [user] slashes at [src.name]'s armor!", 1)
else
+ playsound(src.loc, 'slash.ogg', 50, 1, -1)
user << "\green Your claws had no effect!"
src.occupant_message("\blue The [user]'s claws are stopped by the armor.")
for (var/mob/V in viewers(src))
if(V.client && !(V.blinded))
- V.show_message("The [user] rebounds off the [src.name] armor!", 1)
+ V.show_message("\blue The [user] rebounds off the [src.name] armor!", 1)
return
diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm
index 4ed2b20d57f..bb759d52c99 100644
--- a/code/game/objects/items/item.dm
+++ b/code/game/objects/items/item.dm
@@ -121,9 +121,9 @@
user << "Your claws aren't capable of such fine manipulation."
return
- if(istype(src, /obj/item/weapon/gun)) //Temporary fix until I figure out what's going with monkey/add_blood code./N
- user << "Sorry Mr. Monkey, guns aren't for you."
- return
+// if(istype(src, /obj/item/weapon/gun)) //Temporary fix until I figure out what's going with monkey/add_blood code./N
+// user << "Sorry Mr. Monkey, guns aren't for you."
+// return
if (istype(src.loc, /obj/item/weapon/storage))
for(var/mob/M in range(1, src.loc))
diff --git a/code/game/objects/items/weapons/guns_ammo.dm b/code/game/objects/items/weapons/guns_ammo.dm
index c3db64d8024..bc101885f3e 100644
--- a/code/game/objects/items/weapons/guns_ammo.dm
+++ b/code/game/objects/items/weapons/guns_ammo.dm
@@ -45,7 +45,7 @@ TELEPORT GUN
return
if (flag)
return
- if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ if ((!istype(user, /mob/living/carbon/human)) && ticker.mode != "monkey")
usr << "\red You don't have the dexterity to do this!"
return
@@ -67,44 +67,31 @@ TELEPORT GUN
user.next_move = world.time + 4
spawn()
A.process()
-
+ return
attack(mob/M as mob, mob/user as mob)
..()
src.add_fingerprint(user)
if ((prob(50) && M.stat < 2))
var/mob/living/carbon/human/H = M
- if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(70)))
- M << "\red The helmet protects you from being hit hard in the head!"
+ if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)))
+ M << "\blue The helmet protects you from being hit hard in the head!"
+ for(var/mob/O in viewers(M, null))
+ if(O.client)
+ O.show_message(text("\red [] blocked a hit from []!", M, user), 1)
return
- var/time = rand(50, 170)
+ var/time = rand(20, 60)
if (prob(90))
- M.paralysis = min(time, M.paralysis)
+ M.paralysis = max(time, M.paralysis)
else
- M.weakened = min(time, M.weakened)
+ M.weakened = max(time, M.weakened)
+ src.force = 35
+ ..()
if(M.stat != 2) M.stat = 1
for(var/mob/O in viewers(M, null))
- if(O.client) O.show_message(text("\red [] has been knocked unconscious!", M), 1, "\red You hear someone fall", 2)
-
-
-/obj/item/weapon/gun/energy/pulse_rifle/attack(mob/M as mob, mob/user as mob)
- src.add_fingerprint(user)
-
- if ((istype(M, /mob/living/carbon/human) && istype(M, /obj/item/clothing/head) && M.flags & 8 && prob(80)))
- M << "\blue The helmet protects you from being hit hard in the head!"
+ if(O.client)
+ O.show_message(text("\red [] has been rifle butted by []!", M, user), 1, "\red You hear someone fall.", 2)
return
- if (prob(50))
- if (M.paralysis < 60)
- M.paralysis = 60
- else
- if (M.weakened < 60)
- M.weakened = 60
- src.force = 35
- ..()
- if(M.stat != 2) M.stat = 1
- for(var/mob/O in viewers(M, null))
- if (O.client)
- O.show_message(text("\red [] has been rifle butted by []!", M, user), 1, "\red You hear someone fall", 2)
- return
+
// AMMO
@@ -165,7 +152,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
/obj/item/weapon/gun/revolver/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
if (flag)
return
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ if ((!istype(user, /mob/living/carbon/human)) && ticker.mode != "monkey")
usr << "\red You don't have the dexterity to do this!"
return
src.add_fingerprint(user)
@@ -310,7 +297,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
/obj/item/weapon/gun/shotgun/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
if (flag)
return
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ if ((!istype(user, /mob/living/carbon/human)) && ticker.mode != "monkey")
usr << "\red You don't have the dexterity to do this!"
return
if (src.pumped == 0)
@@ -473,7 +460,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
if (flag)
return
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ if ((!istype(user, /mob/living/carbon/human)) && ticker.mode != "monkey")
usr << "\red You don't have the dexterity to do this!"
return
if(!detective)
@@ -589,7 +576,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
return
if (flag)
return
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ if ((!istype(user, /mob/living/carbon/human)) && ticker.mode != "monkey")
usr << "\red You don't have the dexterity to do this!"
return
@@ -666,7 +653,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
/obj/item/weapon/gun/energy/taser_gun/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
if(flag)
return
- if (ismonkey(user) && ticker.mode.name != "monkey")
+ if ((!istype(user, /mob/living/carbon/human)) && ticker.mode != "monkey")
user << "\red You don't have the dexterity to do this!"
return
src.add_fingerprint(user)
@@ -789,7 +776,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
/obj/item/weapon/gun/energy/crossbow/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
if(flag)
return
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ if ((!istype(user, /mob/living/carbon/human)) && ticker.mode != "monkey")
usr << "\red You don't have the dexterity to do this!"
return
@@ -865,7 +852,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
/obj/item/weapon/gun/energy/teleport_gun/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
if(flag)
return
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ if ((!istype(user, /mob/living/carbon/human)) && ticker.mode != "monkey")
usr << "\red You don't have the dexterity to do this!"
return
src.add_fingerprint(user)
@@ -980,7 +967,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
return
if (flag)
return
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ if ((!istype(user, /mob/living/carbon/human)) && ticker.mode != "monkey")
usr << "\red You don't have the dexterity to do this!"
return
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 12bbc031af5..50502d7ab3c 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -9,6 +9,7 @@
if ("punch") soundin = pick('punch1.ogg','punch2.ogg','punch3.ogg','punch4.ogg')
if ("clownstep") soundin = pick('clownstep1.ogg','clownstep2.ogg')
if ("swing_hit") soundin = pick('genhit1.ogg', 'genhit2.ogg', 'genhit3.ogg')
+ if ("hiss") soundin = pick('hiss1.ogg','hiss2.ogg','hiss3.ogg','hiss4.ogg')
var/sound/S = sound(soundin)
S.wait = 0 //No queue
@@ -35,6 +36,7 @@
if ("punch") soundin = pick('punch1.ogg','punch2.ogg','punch3.ogg','punch4.ogg')
if ("clownstep") soundin = pick('clownstep1.ogg','clownstep2.ogg')
if ("swing_hit") soundin = pick('genhit1.ogg', 'genhit2.ogg', 'genhit3.ogg')
+ if ("hiss") soundin = pick('hiss1.ogg','hiss2.ogg','hiss3.ogg','hiss4.ogg')
var/sound/S = sound(soundin)
S.wait = 0 //No queue
@@ -76,7 +78,8 @@ client/verb/Toggle_Soundscape()
switch(src.name)
if ("Chapel") sound = pick('ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg')
if ("Morgue") sound = pick('ambimo1.ogg','ambimo2.ogg')
- if ("Engine Control") sound = pick('ambieng1.ogg')
+// if ("Engine Control") sound = pick('ambieng1.ogg') Commenting out in favor of a new, more applicable sound./N
+ if ("Engine Control") sound = pick('ambisin1.ogg','ambisin2.ogg','ambisin3.ogg','ambisin4.ogg')
if ("Atmospherics") sound = pick('ambiatm1.ogg')
else sound = pick('ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg')
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index f7b4ec83357..5b74e4ea5ec 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -628,6 +628,7 @@ This is all very silly and I will probably remove it in the future. /N
if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
return
if (src.health > 0)
+ playsound(src.loc, 'bite.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red [M.name] has bit [src]!"), 1)
src.bruteloss += rand(1, 3)
@@ -778,6 +779,7 @@ In all, this is a lot like the monkey code. /N
else
if (src.health > 0)
+ playsound(src.loc, 'bite.ogg', 50, 1, -1)
var/damage = rand(1, 3)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red [M.name] has bit []!", src), 1)
diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm
index 15a28053ec2..bba4aed121d 100644
--- a/code/modules/mob/living/carbon/alien/larva/emote.dm
+++ b/code/modules/mob/living/carbon/alien/larva/emote.dm
@@ -26,10 +26,10 @@
if (!muzzled)
message = "The [src.name] whimpers."
m_type = 2
- if("roar")
- if (!muzzled)
- message = "The [src.name] roars."
- m_type = 2
+// if("roar")
+// if (!muzzled)
+// message = "The [src.name] roars." Commenting out since larva shouldn't roar /N
+// m_type = 2
if("tail")
message = "The [src.name] waves its tail."
m_type = 1
@@ -90,7 +90,7 @@
message = text("[] collapses!", src)
m_type = 2
if("help")
- src << "choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper"
+ src << "choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper"
else
src << text("Invalid Emote: []", act)
if ((message && src.stat == 0))
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index ee6a36a3885..4098d9eb524 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -344,7 +344,7 @@
if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
return
if (src.health > 0)
-
+ playsound(src.loc, 'bite.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red [M.name] has bit [src]!"), 1)
var/damage = rand(1, 3)
@@ -472,6 +472,7 @@
else
if (src.health > 0)
+ playsound(src.loc, 'bite.ogg', 50, 1, -1)
var/damage = rand(1, 3)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red [M.name] has bit []!", src), 1)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index f76e058154f..77eac63c638 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -170,6 +170,7 @@
else
if ((M.a_intent == "hurt" && !( istype(src.wear_mask, /obj/item/clothing/mask/muzzle) )))
if ((prob(75) && src.health > 0))
+ playsound(src.loc, 'bite.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message("\red [M.name] has bit [src.name]!", 1)
var/damage = rand(1, 5)
diff --git a/sound/ambience/ambisin1.ogg b/sound/ambience/ambisin1.ogg
new file mode 100644
index 00000000000..a31c7b226e9
Binary files /dev/null and b/sound/ambience/ambisin1.ogg differ
diff --git a/sound/ambience/ambisin2.ogg b/sound/ambience/ambisin2.ogg
new file mode 100644
index 00000000000..fbac9a73e92
Binary files /dev/null and b/sound/ambience/ambisin2.ogg differ
diff --git a/sound/ambience/ambisin3.ogg b/sound/ambience/ambisin3.ogg
new file mode 100644
index 00000000000..c71d1ae2936
Binary files /dev/null and b/sound/ambience/ambisin3.ogg differ
diff --git a/sound/ambience/ambisin4.ogg b/sound/ambience/ambisin4.ogg
new file mode 100644
index 00000000000..76be2ef85c6
Binary files /dev/null and b/sound/ambience/ambisin4.ogg differ
diff --git a/sound/ambience/bite.ogg b/sound/ambience/bite.ogg
new file mode 100644
index 00000000000..596d332960f
Binary files /dev/null and b/sound/ambience/bite.ogg differ
diff --git a/sound/ambience/hiss1.ogg b/sound/ambience/hiss1.ogg
new file mode 100644
index 00000000000..ccb6161da09
Binary files /dev/null and b/sound/ambience/hiss1.ogg differ
diff --git a/sound/ambience/hiss2.ogg b/sound/ambience/hiss2.ogg
new file mode 100644
index 00000000000..1646ae98d6e
Binary files /dev/null and b/sound/ambience/hiss2.ogg differ
diff --git a/sound/ambience/hiss3.ogg b/sound/ambience/hiss3.ogg
new file mode 100644
index 00000000000..79dfae542e2
Binary files /dev/null and b/sound/ambience/hiss3.ogg differ
diff --git a/sound/ambience/hiss4.ogg b/sound/ambience/hiss4.ogg
new file mode 100644
index 00000000000..3e1867dc5e1
Binary files /dev/null and b/sound/ambience/hiss4.ogg differ
diff --git a/sound/ambience/hiss5.ogg b/sound/ambience/hiss5.ogg
new file mode 100644
index 00000000000..10ddbe0769b
Binary files /dev/null and b/sound/ambience/hiss5.ogg differ