cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Corrected CentCom Officer suit and added the Commander suit.

Browse Source 
Minor adjustments to alien health icons.
Fixed aliens hissing when they were doing their regular emotes.
Added death sound to aliens.
Aliens can now properly attack/interact with space carp.
Adjusted alien damage to monkeys.
A few wip sprites.
Fixed pulse rifles, again.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@729 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2010-12-28 19:51:32 +00:00
parent e11d311a14
commit d963bfe6e3
14 changed files with 75 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/guns_ammo.dm
+23 -27
View File
@@ -68,30 +68,30 @@ TELEPORT GUN
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(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 <B>[] blocked a hit from []!</B>", M, user), 1)
return
var/time = rand(20, 60)
if (prob(90))
M.paralysis = max(time, M.paralysis)
else
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 <B>[] has been rifle butted by []!</B>", M, user), 1, "\red You hear someone fall.", 2)
return
/obj/item/weapon/gun/energy/pulse_rifle/attack(mob/M as mob, mob/user as mob)
src.add_fingerprint(user)
var/mob/living/carbon/human/H = M
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 <B>[] blocked a hit from []!</B>", M, user), 1)
return
else
var/time = rand(20, 60)
if (prob(90))
M.paralysis = max(time, M.paralysis)
else
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 <B>[] has been rifle butted by []!</B>", M, user), 1, "\red You hear someone fall.", 2)
return
// AMMO
@@ -539,10 +539,6 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
if (O.client) O.show_message(text("\red <B>[] has been pistol whipped with the detectives revolver by []!</B>", M, user), 1, "\red You hear someone fall", 2)
return
// ENERGY GUN
/obj/item/weapon/gun/energy/proc/update_icon()