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

Merge pull request #7919 from Fox-McCloud/hydro-updates

Browse Source 
Updates Hydroponics, Nerfs it, Adds Onions
This commit is contained in:
Crazy Lemon
2017-08-06 06:45:36 -07:00
committed by GitHub
parent c820c95fba b1495e7cf5
commit 21bd7e7f24
20 changed files with 241 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_defenses.dm
+4
View File
@@ -40,3 +40,7 @@
if(D.IsSpreadByTouch())
ContractDisease(D)
return 0
/mob/living/carbon/is_mouth_covered(head_only = FALSE, mask_only = FALSE)
if((!mask_only && head && (head.flags_cover & HEADCOVERSMOUTH)) || (!head_only && wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH)))
return TRUE
code/modules/mob/living/carbon/human/human_defense.dm
+7
View File
@@ -393,3 +393,10 @@ emp_act
..()
species.water_act(src,volume,temperature,source)
/mob/living/carbon/human/is_eyes_covered(check_glasses = TRUE, check_head = TRUE, check_mask = TRUE)
if(check_glasses && glasses && (glasses.flags_cover & GLASSESCOVERSEYES))
return TRUE
if(check_head && head && (head.flags_cover & HEADCOVERSEYES))
return TRUE
if(check_mask && wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH))
return TRUE
code/modules/mob/living/living_defense.dm
+5
View File
@@ -37,6 +37,11 @@
/mob/living/proc/getarmor(var/def_zone, var/type)
return 0
/mob/living/proc/is_mouth_covered(head_only = FALSE, mask_only = FALSE)
return FALSE
/mob/living/proc/is_eyes_covered(check_glasses = TRUE, check_head = TRUE, check_mask = TRUE)
return FALSE
/mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone)
//Armor