diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm
index ad2b7ded..26f163c5 100644
--- a/code/datums/components/infective.dm
+++ b/code/datums/components/infective.dm
@@ -13,12 +13,12 @@
expire_time = world.time + expire_in
QDEL_IN(src, expire_in)
- if(!ismovableatom(parent))
+ if(!ismovable(parent) && !isfloorturf(parent))
return COMPONENT_INCOMPATIBLE
RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean)
RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/try_infect_buckle)
RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/try_infect_collide)
- RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/try_infect_crossed)
+ RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/try_infect_crossed)
RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, .proc/try_infect_impact_zone)
if(isitem(parent))
RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, .proc/try_infect_attack_zone)
@@ -77,12 +77,16 @@
I.permeability_coefficient = old_permeability
/datum/component/infective/proc/try_infect_crossed(datum/source, atom/movable/M)
+ message_admins("Trying to infect from [source] to [M]")
if(isliving(M))
+ message_admins("[M] is living. Trying to infect.")
try_infect(M, BODY_ZONE_PRECISE_L_FOOT)
/datum/component/infective/proc/try_infect_streak(datum/source, list/directions, list/output_diseases)
output_diseases |= diseases
/datum/component/infective/proc/try_infect(mob/living/L, target_zone)
+ message_admins("Trying to infect [L] through [target_zone]")
for(var/V in diseases)
L.ContactContractDisease(V, target_zone)
+ message_admins("Disease found, trying to infect [L] with [V]")
diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm
index d404c95a..6848394e 100644
--- a/code/datums/diseases/advance/symptoms/beard.dm
+++ b/code/datums/diseases/advance/symptoms/beard.dm
@@ -17,7 +17,7 @@ BONUS
/datum/symptom/beard
name = "Facial Hypertrichosis"
- desc = "The virus increases hair production significantly, causing rapid beard growth."
+ desc = "The virus increases hair production significantly, causing rapid beard growth. Or it would, but now it just gives people socks. Who knows."
stealth = 0
resistance = 3
stage_speed = 2
@@ -34,18 +34,6 @@ BONUS
if(ishuman(M))
var/mob/living/carbon/human/H = M
switch(A.stage)
- if(1, 2)
- to_chat(H, "Your chin itches.")
- if(H.facial_hair_style == "Shaved")
- H.facial_hair_style = "Jensen Beard"
- H.update_hair()
- if(3, 4)
- to_chat(H, "You feel tough.")
- if(!(H.facial_hair_style == "Dwarf Beard") && !(H.facial_hair_style == "Very Long Beard") && !(H.facial_hair_style == "Full Beard"))
- H.facial_hair_style = "Full Beard"
- H.update_hair()
- else
- to_chat(H, "You feel manly!")
- if(!(H.facial_hair_style == "Dwarf Beard") && !(H.facial_hair_style == "Very Long Beard"))
- H.facial_hair_style = pick("Dwarf Beard", "Very Long Beard")
- H.update_hair()
+ if(5)
+ H.socks = "Stockings - Programmer"
+ H.update_body()
diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm
index 58357f04..14bde7e3 100644
--- a/code/datums/diseases/advance/symptoms/shedding.dm
+++ b/code/datums/diseases/advance/symptoms/shedding.dm
@@ -16,7 +16,7 @@ BONUS
/datum/symptom/shedding
name = "Alopecia"
- desc = "The virus causes rapid shedding of head and body hair."
+ desc = "The virus causes rapid shedding of head and body hair. Or it would, but now it just gives people socks. Who knows."
stealth = 0
resistance = 1
stage_speed = 2
@@ -37,14 +37,9 @@ BONUS
if(ishuman(M))
var/mob/living/carbon/human/H = M
switch(A.stage)
- if(3, 4)
- if(!(H.hair_style == "Bald") && !(H.hair_style == "Balding Hair"))
- to_chat(H, "Your hair starts to fall out in clumps...")
- addtimer(CALLBACK(src, .proc/Shed, H, FALSE), 50)
if(5)
- if(!(H.facial_hair_style == "Shaved") || !(H.hair_style == "Bald"))
- to_chat(H, "Your hair starts to fall out in clumps...")
- addtimer(CALLBACK(src, .proc/Shed, H, TRUE), 50)
+ H.socks = "Stockings - Programmer"
+ H.update_body()
/datum/symptom/shedding/proc/Shed(mob/living/carbon/human/H, fullbald)
if(fullbald)
diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm
index 300eecc8..044a3c01 100644
--- a/code/datums/diseases/advance/symptoms/skin.dm
+++ b/code/datums/diseases/advance/symptoms/skin.dm
@@ -17,7 +17,7 @@ BONUS
/datum/symptom/vitiligo
name = "Vitiligo"
- desc = "The virus destroys skin pigment cells, causing rapid loss of pigmentation in the host."
+ desc = "The virus destroys skin pigment cells, causing rapid loss of pigmentation in the host. Or it would, but now it just gives people socks. Who knows."
stealth = 2
resistance = 0
stage_speed = 3
@@ -33,14 +33,9 @@ BONUS
var/mob/living/M = A.affected_mob
if(ishuman(M))
var/mob/living/carbon/human/H = M
- if(H.skin_tone == "albino")
- return
switch(A.stage)
if(5)
- H.skin_tone = "albino"
- H.update_body(0)
- else
- H.visible_message("[H] looks a bit pale...", "Your skin suddenly appears lighter...")
+ H.socks = "Stockings - Programmer"
/*
@@ -62,7 +57,7 @@ BONUS
/datum/symptom/revitiligo
name = "Revitiligo"
- desc = "The virus causes increased production of skin pigment cells, making the host's skin grow darker over time."
+ desc = "The virus causes increased production of skin pigment cells, making the host's skin grow darker over time. Or it would, but now it just gives people socks. Who knows."
stealth = -1
resistance = 3
stage_speed = 1
@@ -78,11 +73,7 @@ BONUS
var/mob/living/M = A.affected_mob
if(ishuman(M))
var/mob/living/carbon/human/H = M
- if(H.skin_tone == "african2")
- return
switch(A.stage)
if(5)
- H.skin_tone = "african2"
- H.update_body(0)
- else
- H.visible_message("[H] looks a bit dark...", "Your skin suddenly appears darker...")
+ H.socks = "Stockings - Programmer"
+ H.update_body()