also syncs a bunch of shit

This commit is contained in:
LetterJay
2017-12-29 04:12:43 -06:00
parent 518b264654
commit c7db4e8310
11 changed files with 133 additions and 126 deletions
+10 -9
View File
@@ -3,29 +3,29 @@
for(var/thing in viruses)
var/datum/disease/DD = thing
if(D.IsSame(DD))
return 1
return 0
return TRUE
return FALSE
/mob/proc/CanContractDisease(datum/disease/D)
if(stat == DEAD)
return 0
return FALSE
if(D.GetDiseaseID() in resistances)
return 0
return FALSE
if(HasDisease(D))
return 0
return FALSE
if(!(type in D.viable_mobtypes))
return 0
return FALSE
return 1
return TRUE
/mob/proc/ContactContractDisease(datum/disease/D)
if(!CanContractDisease(D))
return 0
return FALSE
AddDisease(D)
@@ -53,12 +53,13 @@
else
DD.vars[V] = D.vars[V]
DD.after_add()
DD.affected_mob.med_hud_set_status()
/mob/living/carbon/ContactContractDisease(datum/disease/D, target_zone)
if(!CanContractDisease(D))
return 0
return FALSE
var/obj/item/clothing/Cl = null
var/passed = TRUE
+7 -4
View File
@@ -60,14 +60,14 @@
/datum/disease/proc/has_cure()
if(!(disease_flags & CURABLE))
return 0
return FALSE
. = cures.len
for(var/C_id in cures)
if(!affected_mob.reagents.has_reagent(C_id))
.--
if(!. || (needs_all_cures && . < cures.len))
return 0
return FALSE
//Airborne spreading
/datum/disease/proc/spread(force_spread = 0)
@@ -111,8 +111,8 @@
/datum/disease/proc/IsSame(datum/disease/D)
if(istype(src, D.type))
return 1
return 0
return TRUE
return FALSE
/datum/disease/proc/Copy()
@@ -120,6 +120,9 @@
D.strain_data = strain_data.Copy()
return D
/datum/disease/proc/after_add()
return
/datum/disease/proc/GetDiseaseID()
return "[type]"
+18 -6
View File
@@ -65,8 +65,8 @@
/datum/disease/transformation/jungle_fever
name = "Jungle Fever"
cure_text = "Bananas"
cures = list("banana")
cure_text = "Death."
cures = list("adminordrazine")
spread_text = "Monkey Bites"
spread_flags = VIRUS_SPREAD_SPECIAL
viable_mobtypes = list(/mob/living/carbon/monkey, /mob/living/carbon/human)
@@ -88,9 +88,12 @@
stage5 = list("<span class='warning'>You feel like monkeying around.</span>")
/datum/disease/transformation/jungle_fever/do_disease_transformation(mob/living/carbon/affected_mob)
if(!ismonkey(affected_mob))
SSticker.mode.add_monkey(affected_mob.mind)
affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
if(affected_mob.mind && !is_monkey(affected_mob))
add_monkey(affected_mob.mind)
if(ishuman(affected_mob))
var/mob/living/carbon/monkey/M = affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
M.ventcrawler = VENTCRAWLER_ALWAYS
/datum/disease/transformation/jungle_fever/stage_act()
..()
@@ -107,9 +110,18 @@
affected_mob.say(pick("Eeek, ook ook!", "Eee-eeek!", "Eeee!", "Ungh, ungh."))
/datum/disease/transformation/jungle_fever/cure()
SSticker.mode.remove_monkey(affected_mob.mind)
remove_monkey(affected_mob.mind)
..()
/datum/disease/transformation/jungle_fever/monkeymode
visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
disease_flags = CAN_CARRY //no vaccines! no cure!
/datum/disease/transformation/jungle_fever/monkeymode/after_add()
if(affected_mob && !is_monkey_leader(affected_mob.mind))
visibility_flags = NONE
/datum/disease/transformation/robot