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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

Browse Source 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
This commit is contained in:
Markolie
2017-01-11 23:11:29 +01:00
parent 0adc370d55 2069ea0457
commit f85e8fe551
97 changed files with 1104 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/_MobProcs.dm
+2 -2
View File
@@ -77,8 +77,8 @@
if(prob(15/D.permeability_mod))
return
/* if(satiety>0 && prob(satiety/10)) // positive satiety makes it harder to contract the disease.
return*/
if(satiety > 0 && prob(satiety/10)) // positive satiety makes it harder to contract the disease.
return
var/target_zone = pick(head_ch;1,body_ch;2,hands_ch;3,feet_ch;4)
code/datums/diseases/_disease.dm
+1 -1
View File
@@ -102,7 +102,7 @@ var/list/diseases = subtypesof(/datum/disease)
return
if(affected_mob)
if(affected_mob.reagents.has_reagent("spaceacillin"))
if(affected_mob.reagents.has_reagent("spaceacillin") || (affected_mob.satiety > 0 && prob(affected_mob.satiety/10)))
return
var/spread_range = 1
code/datums/recipe.dm
+1 -1
View File
@@ -37,7 +37,7 @@
var/list/reagents // example: = list("berryjuice" = 5) // do not list same reagent twice
var/list/items // example: = list(/obj/item/weapon/crowbar, /obj/item/weapon/welder) // place /foo/bar before /foo
var/list/fruit // example: = list("fruit" = 3)
var/result // example: = /obj/item/weapon/reagent_containers/food/snacks/donut/normal
var/result // example: = /obj/item/weapon/reagent_containers/food/snacks/donut
var/time = 100 // 1/10 part of second
var/byproduct // example: = /obj/item/weapon/kitchen/mould // byproduct to return, such as a mould or trash