cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 14:15:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a light issue in Security Maintenance (thanks to muskets).

Browse Source 
Update to Bridge.
More updates to CentCom. Added doors (elevator sprite) to CentCom but they are inaccessible at the moment.
Added new weapon sounds: blaster, laser, pulse, wave, emitter, and one for the marauder canon. Not all are used at the moment.
New sounds for the energy sword on and off states (they're unlicensed, I promise).
Added/changed alien attack sounds.
Added some more messages for aliens attacking mechs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@700 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2010-12-25 08:30:40 +00:00
parent f0fa7bb9bd
commit 7d0ad606e4
30 changed files with 5461 additions and 5381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+6 -2
View File
@@ -1444,7 +1444,7 @@
if (src.organs[def_zone])
affecting = src.organs[def_zone]
if ((istype(affecting, /datum/organ/external) && prob(95)))
playsound(src.loc, "punch", 25, 1, -1)
playsound(src.loc, 'slice.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
if (def_zone == "head")
@@ -1469,7 +1469,7 @@
if (prob(50))
if (src.weakened < 5)
src.weakened = 5
playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
playsound(src.loc, 'slashmiss.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has tackled down []!</B>", M, src), 1, "\red You hear someone fall.", 2)
else
@@ -1504,6 +1504,7 @@
src.updatehealth()
else
playsound(src.loc, 'slashmiss.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[M] has lunged at [src] but missed!</B>"), 1)
return
@@ -1514,15 +1515,18 @@
src.w_uniform.add_fingerprint(M)
var/randn = rand(1, 100)
if (randn <= 25)
playsound(src.loc, 'pierce.ogg', 25, 1, -1)
src.weakened = 2
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has tackled over []!</B>", M, src), 1)
else
if (randn <= 60)
playsound(src.loc, 'slash.ogg', 25, 1, -1)
src.drop_item()
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has knocked the item out of []'s hand!</B>", M, src), 1)
else
playsound(src.loc, 'slashmiss.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has tried to knock the item out of []'s hand!</B>", M, src), 1)
return
code/modules/mob/living/carbon/monkey/monkey.dm
+4 -5
View File
@@ -292,7 +292,7 @@
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has slashed [src.name]!</B>", M), 1)
playsound(src.loc, "punch", 25, 1, -1)
playsound(src.loc, 'slice.ogg', 25, 1, -1)
var/damage = rand(5, 10)
if (prob(40))
damage = rand(20, 40)
@@ -306,7 +306,7 @@
src.bruteloss += damage
src.updatehealth()
else
playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has attempted to lunge at [src.name]!</B>", M), 1)
@@ -329,15 +329,14 @@
O.show_message(text("\red [] has grabbed [src.name] passively!", M), 1)
else
if (!( src.paralysis ))
if (prob(25))
playsound(src.loc, 'pierce.ogg', 25, 1, -1)
if(prob(25))
src.paralysis = 2
playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has tackled down [src.name]!</B>", M), 1)
else
drop_item()
playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has disarmed [src.name]!</B>", M), 1)
code/modules/mob/living/silicon/hivebot/hivebot.dm
+4 -4
View File
@@ -227,7 +227,7 @@
src.weakened = max(src.weakened,4)
src.stunned = max(src.stunned,4)
*/
playsound(src.loc, "punch", 25, 1, -1)
playsound(src.loc, 'slash.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
if(prob(8))
@@ -235,7 +235,7 @@
src.bruteloss += damage
src.updatehealth()
else
playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
return
@@ -247,11 +247,11 @@
src.stunned = 5
step(src,get_dir(M,src))
spawn(5) step(src,get_dir(M,src))
playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
playsound(src.loc, 'slash.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has pushed back []!</B>", M, src), 1)
else
playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] attempted to push back []!</B>", M, src), 1)
return
code/modules/mob/living/silicon/robot/robot.dm
+4 -4
View File
@@ -493,7 +493,7 @@
src.stunned = max(src.stunned,4)
*/
playsound(src.loc, "punch", 25, 1, -1)
playsound(src.loc, 'slash.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
if(prob(8))
@@ -501,7 +501,7 @@
src.bruteloss += damage
src.updatehealth()
else
playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
return
@@ -513,11 +513,11 @@
src.stunned = 5
step(src,get_dir(M,src))
spawn(5) step(src,get_dir(M,src))
playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
playsound(src.loc, 'slash.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has pushed back []!</B>", M, src), 1)
else
playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] attempted to push back []!</B>", M, src), 1)
return