From fc287c49f502825a7f9648a3af1b3384fbaaef37 Mon Sep 17 00:00:00 2001 From: Couls Date: Tue, 9 Jul 2019 17:40:04 -0400 Subject: [PATCH 1/7] Can now suck people with ckeys again, unhumanized monkeys give blood --- code/game/gamemodes/vampire/vampire.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 3a3a9ed1a28..eab4647896c 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -297,16 +297,16 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha to_chat(owner, "They've got no blood left to give.") break if(H.stat < DEAD) - if(!issmall(H) && !H.ckey) + if(H.ckey) blood = min(20, H.blood_volume) // if they have less than 20 blood, give them the remnant else they get 20 blood bloodtotal += blood / 2 //divide by 2 to counted the double suction since removing cloneloss -Melandor0 bloodusable += blood / 2 else - if(!issmall(H) && !H.ckey) + if(H.ckey) blood = min(5, H.blood_volume) // The dead only give 5 blood bloodtotal += blood if(old_bloodtotal != bloodtotal) - if(!issmall(H) && !H.ckey) + if(H.ckey) to_chat(owner, "You have accumulated [bloodtotal] [bloodtotal > 1 ? "units" : "unit"] of blood[bloodusable != old_bloodusable ? ", and have [bloodusable] left to use" : ""].") check_vampire_upgrade() H.blood_volume = max(H.blood_volume - 25, 0) From 217d0503f76391d7925ba3f917ad26df9f5ec8fd Mon Sep 17 00:00:00 2001 From: Couls Date: Tue, 9 Jul 2019 17:41:23 -0400 Subject: [PATCH 2/7] Can suck humanized monkeys again --- code/game/gamemodes/vampire/vampire.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index eab4647896c..b8328b5d726 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -297,16 +297,16 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha to_chat(owner, "They've got no blood left to give.") break if(H.stat < DEAD) - if(H.ckey) + if(!issmall(H) || H.ckey) blood = min(20, H.blood_volume) // if they have less than 20 blood, give them the remnant else they get 20 blood bloodtotal += blood / 2 //divide by 2 to counted the double suction since removing cloneloss -Melandor0 bloodusable += blood / 2 else - if(H.ckey) + if(!issmall(H) || H.ckey) blood = min(5, H.blood_volume) // The dead only give 5 blood bloodtotal += blood if(old_bloodtotal != bloodtotal) - if(H.ckey) + if(!issmall(H) || H.ckey) to_chat(owner, "You have accumulated [bloodtotal] [bloodtotal > 1 ? "units" : "unit"] of blood[bloodusable != old_bloodusable ? ", and have [bloodusable] left to use" : ""].") check_vampire_upgrade() H.blood_volume = max(H.blood_volume - 25, 0) From 3caa97e4f9f8efd39c4bbe53991afb0d5fc9242c Mon Sep 17 00:00:00 2001 From: Couls Date: Tue, 9 Jul 2019 17:48:23 -0400 Subject: [PATCH 3/7] add comments for future contributors --- code/game/gamemodes/vampire/vampire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index b8328b5d726..2bee736e3bd 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -306,7 +306,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha blood = min(5, H.blood_volume) // The dead only give 5 blood bloodtotal += blood if(old_bloodtotal != bloodtotal) - if(!issmall(H) || H.ckey) + if(!issmall(H) || H.ckey) // not small OR has a ckey, monkeys with ckeys can be sucked, humanized monkeys can be sucked monkeys without ckeys cannot be sucked to_chat(owner, "You have accumulated [bloodtotal] [bloodtotal > 1 ? "units" : "unit"] of blood[bloodusable != old_bloodusable ? ", and have [bloodusable] left to use" : ""].") check_vampire_upgrade() H.blood_volume = max(H.blood_volume - 25, 0) From 880bddecb6532d0dd16580b53630917da60a41ff Mon Sep 17 00:00:00 2001 From: Couls Date: Tue, 9 Jul 2019 17:57:12 -0400 Subject: [PATCH 4/7] Add a notice as to why monkeys don't give blood --- code/game/gamemodes/vampire/vampire.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 2bee736e3bd..9e68a4e6fda 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -313,6 +313,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(ishuman(owner)) var/mob/living/carbon/human/V = owner if(issmall(H) && !H.ckey) + to_chat(src, "Your feeding on [H] reduces your hunger, but you get no usable blood from it.") V.nutrition = min(NUTRITION_LEVEL_WELL_FED, V.nutrition + 5) else V.nutrition = min(NUTRITION_LEVEL_WELL_FED, V.nutrition + (blood / 2)) From 7c984378929b69f72da65e0b4df4fefe27ae2ccf Mon Sep 17 00:00:00 2001 From: Couls Date: Tue, 9 Jul 2019 18:09:21 -0400 Subject: [PATCH 5/7] send message to the right person --- code/game/gamemodes/vampire/vampire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 9e68a4e6fda..934b7866302 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -313,7 +313,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(ishuman(owner)) var/mob/living/carbon/human/V = owner if(issmall(H) && !H.ckey) - to_chat(src, "Your feeding on [H] reduces your hunger, but you get no usable blood from it.") + to_chat(V, "Your feeding on [H] reduces your hunger, but you get no usable blood from it.") V.nutrition = min(NUTRITION_LEVEL_WELL_FED, V.nutrition + 5) else V.nutrition = min(NUTRITION_LEVEL_WELL_FED, V.nutrition + (blood / 2)) From f6f61bf91b3131d64df12910d1dfa7d8b89fe488 Mon Sep 17 00:00:00 2001 From: Couls Date: Tue, 9 Jul 2019 18:53:05 -0400 Subject: [PATCH 6/7] grammar --- code/game/gamemodes/vampire/vampire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 934b7866302..cfee2b36873 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -313,7 +313,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(ishuman(owner)) var/mob/living/carbon/human/V = owner if(issmall(H) && !H.ckey) - to_chat(V, "Your feeding on [H] reduces your hunger, but you get no usable blood from it.") + to_chat(V, "feeding on [H] reduces your hunger, but you get no usable blood from it.") V.nutrition = min(NUTRITION_LEVEL_WELL_FED, V.nutrition + 5) else V.nutrition = min(NUTRITION_LEVEL_WELL_FED, V.nutrition + (blood / 2)) From 197192789e293094a24c3c04e07eb5881d2c37fc Mon Sep 17 00:00:00 2001 From: Couls Date: Tue, 9 Jul 2019 18:59:23 -0400 Subject: [PATCH 7/7] Derp --- code/game/gamemodes/vampire/vampire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index cfee2b36873..5fc01686200 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -313,7 +313,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(ishuman(owner)) var/mob/living/carbon/human/V = owner if(issmall(H) && !H.ckey) - to_chat(V, "feeding on [H] reduces your hunger, but you get no usable blood from it.") + to_chat(V, "Feeding on [H] reduces your hunger, but you get no usable blood from it.") V.nutrition = min(NUTRITION_LEVEL_WELL_FED, V.nutrition + 5) else V.nutrition = min(NUTRITION_LEVEL_WELL_FED, V.nutrition + (blood / 2))