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

When ninjas teleport into a living mob(s), that mob is gibbed. HIYA

Browse Source 
Added emp pulse to ninjas powers (Ninja gear is not affected by EMP).
Ninja mask protects against flash (portable and set).
Ninja mask can toggle voice changer and vision modes (right click).
Ninjas can toggle stealth (right click suit).

Thermals and mesons no-longer give (slightly) better night vision.
Commented out tray sounds until we get the files uploaded so the game compiles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1349 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2011-04-03 00:10:16 +00:00
parent 7db4226cd3
commit 50dd198fb5
11 changed files with 190 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+6 -1
View File
@@ -1337,6 +1337,11 @@
shielded = 2
break
for (var/obj/item/clothing/suit/space/space_ninja/S in src)
if (S.active)
shielded = 2
break
if (shielded == 2)
src.invisibility = 2
else
@@ -2696,7 +2701,7 @@
var/obj/item/clothing/gloves/G = src.gloves
siemens_coeff = G.siemens_coefficient
return ..(shock_damage,source,siemens_coeff)
/mob/living/carbon/human/heal_organ_damage(var/brute, var/burn)
..()
src.UpdateDamageIcon()
code/modules/mob/living/carbon/human/life.dm
+20 -6
View File
@@ -110,7 +110,7 @@
::::::::::::::::::::::::"~-,_::::::::::::::"~-,_:::"-,/|/\::::::::::: \::: \"-/|::|
:::::::::::::::::::::::::::::::"~-,__:::::::::::',"-,:::"_|/\:|\: : : : \::\":/|\|
::::::::::::::::::::::::::::::::::::::::"~-,_:::::\:::\:::"~/_:|:|\: : : '-,\::"::,'\
:::::::::::::::::::::::::::::::::::::::::::::::"-,_:'-,::\:::::::"-,|:||\,-, : '-,\:::|-'-„
:::::::::::::::::::::::::::::::::::::::::::::::"-,_:'-,::\:::::::"-,|:||\,-, : '-,\:::|-'-
:::::::::::::::::::::::::::::::::::::::::::::::::: ::,-,'"-:"~,:::::"/_/::|-/\--';;\:::/: ||\-,
:::::::::::::::::::::::::::::::::::::::::::::::::: :/...'-,::::::"~„::::"-,/_:|:/\:/|/|/|_/:|
:::::::::::::::::::::::::::::::::::::::::::::::::: |......"-,::::::::"~-:::::""~~~"¯:::|
@@ -723,9 +723,24 @@
src.see_in_dark = 8
if(!src.druggy)
src.see_invisible = 2
else if (istype(src.wear_mask, /obj/item/clothing/mask/gas/space_ninja))
switch(src.wear_mask:mode)
if(1)
src.see_in_dark = 5
if(!src.druggy)
src.see_invisible = 0
if(2)
src.sight |= SEE_MOBS
if(!src.druggy)
src.see_invisible = 2
if(3)
src.sight |= SEE_TURFS
if(!src.druggy)
src.see_invisible = 0
else if (istype(src.glasses, /obj/item/clothing/glasses/meson))
src.sight |= SEE_TURFS
src.see_in_dark = 3
if(!src.druggy)
src.see_invisible = 0
else if (istype(src.glasses, /obj/item/clothing/glasses/night))
@@ -734,9 +749,9 @@
src.see_invisible = 0
else if (istype(src.glasses, /obj/item/clothing/glasses/thermal))
src.sight |= SEE_MOBS
src.see_in_dark = 4
if(!src.druggy)
src.see_invisible = 2
else if (src.stat != 2)
src.sight &= ~SEE_TURFS
src.sight &= ~SEE_MOBS
@@ -756,10 +771,9 @@
if(!seer)
src.see_invisible = 0
if (istype(src.glasses, /obj/item/clothing/glasses/sunglasses))
else if (istype(src.glasses, /obj/item/clothing/glasses/sunglasses))
src.see_in_dark = 1
if (istype(src.head, /obj/item/clothing/head/helmet/welding))
else if (istype(src.head, /obj/item/clothing/head/helmet/welding))
if(!src.head:up && tinted_weldhelh)
src.see_in_dark = 1