From 026f5d81297d5d7fea4c54215f01110ccf617066 Mon Sep 17 00:00:00 2001 From: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> Date: Mon, 20 Jul 2020 14:11:41 -0400 Subject: [PATCH 1/4] adds back moth eating --- code/__DEFINES/is_helpers.dm | 3 ++- .../modules/reagents/chemistry/reagents/alcohol_reagents.dm | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 18336ff2..004446c9 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -62,7 +62,8 @@ #define isslimeperson(A) (is_species(A, /datum/species/jelly/slime)) #define isluminescent(A) (is_species(A, /datum/species/jelly/luminescent)) #define iszombie(A) (is_species(A, /datum/species/zombie)) -#define ismoth(A) (is_species(A, /datum/species/moth) || is_species(A, /datum/species/insect)) +#define ismoth(A) (is_species(A, /datum/species/moth)) +#define isinsect(A) (is_species(A, /datum/species/insect)) #define ishumanbasic(A) (is_species(A, /datum/species/human)) #define iscatperson(A) (ishumanbasic(A) && istype(A.dna.species, /datum/species/human/felinid) ) #define isvampire(A) (is_species(A,/datum/species/vampire)) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index b447802c..744cd6e0 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1999,12 +1999,12 @@ datum/reagent/consumable/ethanol/creme_de_coconut /datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/M) //Bugs should not drink Bug spray. - if(ismoth(M) || isflyperson(M)) + if(ismoth(M) || isflyperson(M) || isinsect(M)) M.adjustToxLoss(1,0) return ..() /datum/reagent/consumable/ethanol/bug_spray/on_mob_add(mob/living/carbon/M) - if(ismoth(M) || isflyperson(M)) + if(ismoth(M) || isflyperson(M) || isinsect(M)) M.emote("scream") return ..() @@ -2396,4 +2396,4 @@ datum/reagent/consumable/ethanol/creme_de_coconut /datum/reagent/consumable/ethanol/hotlime_miami/on_mob_life(mob/living/carbon/M) M.set_drugginess(50) M.adjustStaminaLoss(-2) - return ..() \ No newline at end of file + return ..() From 157eb2eff12b8477727aa24a9957c207236ceb2b Mon Sep 17 00:00:00 2001 From: Dahlular <55758850+Dahlular@users.noreply.github.com> Date: Tue, 21 Jul 2020 15:08:09 -0600 Subject: [PATCH 2/4] Changes some Stomping Values (TM) --- hyperstation/code/modules/resize/resizing.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index 2d4bf621..2e2e0a99 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -117,7 +117,7 @@ mob/living/get_effective_size() H.forceMove(tmob.loc) sizediffStamLoss(tmob) H.add_movespeed_modifier(MOVESPEED_ID_STOMP, multiplicative_slowdown = 10) //Full stop - addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 5) //0.5 second + addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 3) //0.3 seconds if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") to_chat(H,"You carefully roll over [tmob] with your tail!") @@ -133,7 +133,7 @@ mob/living/get_effective_size() sizediffStamLoss(tmob) sizediffBruteloss(tmob) H.add_movespeed_modifier(MOVESPEED_ID_STOMP, multiplicative_slowdown = 10) - addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 15) //1.5 second + addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 10) //1 seconds //H.Stun(20) if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") @@ -150,7 +150,7 @@ mob/living/get_effective_size() sizediffStamLoss(tmob) sizediffStun(tmob) H.add_movespeed_modifier(MOVESPEED_ID_STOMP, multiplicative_slowdown = 10) - addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 10)//About 3/4th a second + addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 7)//About 3/4th a second if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET) || (H.shoes && (H.shoes.body_parts_covered & FEET))) if(feetCover) From a3ea5e06bae19f1c526d1d60e7628d59b835949b Mon Sep 17 00:00:00 2001 From: Dahlular Date: Wed, 22 Jul 2020 07:22:18 -0600 Subject: [PATCH 3/4] Growth and Shrink chems --- hyperstation/code/modules/resize/sizechems.dm | 45 +++++++++++-------- tgstation.dme | 1 + 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/hyperstation/code/modules/resize/sizechems.dm b/hyperstation/code/modules/resize/sizechems.dm index 90deb236..40f2ed90 100644 --- a/hyperstation/code/modules/resize/sizechems.dm +++ b/hyperstation/code/modules/resize/sizechems.dm @@ -1,40 +1,49 @@ //Size Chemicals, now with better and less cringy names. -/datum/reagent/dahl/growthchem +/datum/reagent/growthchem name = "Prospacillin" id = "growthchem" description = "A stabilized altercation of size-altering liquids, this one appears to increase cell volume." color = "#E70C0C" - taste_description = "a sharp, fiery and intoxicating flavour." + taste_description = "a sharp, fiery and intoxicating flavour" overdose_threshold = 10 metabolization_rate = 0.25 can_synth = FALSE //DO NOT MAKE THIS SNYTHESIZABLE, THESE CHEMS ARE SUPPOSED TO NOT BE USED COMMONLY -/datum/reagent/dahl/growthchem/on_mob_add(mob/living/carbon/M) - log_game("SIZECODE: [M] ckey: [M.key] has ingested growthchem.") +/datum/reagent/growthchem/on_mob_add(mob/living/carbon/M) + . = ..() + if(ishuman(M)) + log_game("SIZECODE: [M] ckey: [M.key] has ingested growthchem.") -/datum/reagent/dahl/growthchem/on_mob_life(mob/living/carbon/M) +/datum/reagent/growthchem/on_mob_life(mob/living/carbon/M) + if(!ishuman(M)) + return..() if(M.size_multiplier < RESIZE_MACRO) - M.resize(M.size_multiplier+0.01) + M.resize(M.size_multiplier+0.025) + M.visible_message("[pick("[M] grows!", "[M] expands in size!", "[M] pushes outwards in stature!")]", "[pick("You feel your body fighting for space and growing!", "The world contracts inwards in every direction!", "You feel your muscles expand, and your surroundings shrink!")]") + ..() + . = 1 - return - -/datum/reagent/dahl/shrinkchem +/datum/reagent/shrinkchem name = "Diminicillin" id = "shrinkchem" description = "A stabilized altercation of size-altering liquids, this one appears to decrease cell volume." color = "#0C26E7" - taste_description = "a pungent, acidic and jittery flavour." + taste_description = "a pungent, acidic and jittery flavour" overdose_threshold = 10 - metabolization_rate = 0.25 + metabolization_rate = 1 can_synth = FALSE //SAME STORY AS ABOVE -/datum/reagent/dahl/shrinkchem/on_mob_add(mob/living/carbon/M) - log_game("SIZECODE: [M] ckey: [M.key] has ingested shrinkchem.") +/datum/reagent/shrinkchem/on_mob_add(mob/living/carbon/M) + . = ..() + if(ishuman(M)) + log_game("SIZECODE: [M] ckey: [M.key] has ingested shrinkchem.") -/datum/reagent/dahl/shrinkchem/on_mob_life(mob/living/carbon/M) +/datum/reagent/shrinkchem/on_mob_life(mob/living/carbon/M) + if(!ishuman(M)) + return..() if(M.size_multiplier > RESIZE_MICRO) - M.resize(M.size_multiplier-0.01) - - return - + M.resize(M.size_multiplier-0.025) + M.visible_message("[pick("[M] shrinks down!", "[M] dwindles in size!", "[M] compresses down!")]", "[pick("You feel your body compressing in size!", "The world pushes outwards in every direction!", "You feel your muscles contract, and your surroundings grow!")]") + ..() + . = 1 diff --git a/tgstation.dme b/tgstation.dme index 61d52602..84bb7fde 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2899,6 +2899,7 @@ #include "hyperstation\code\modules\patreon\patreon.dm" #include "hyperstation\code\modules\resize\holder_micro.dm" #include "hyperstation\code\modules\resize\resizing.dm" +#include "hyperstation\code\modules\resize\sizechems.dm" #include "hyperstation\code\modules\resize\sizegun.dm" #include "hyperstation\code\obj\bluespace sewing kit.dm" #include "hyperstation\code\obj\decal.dm" From 1a3e674e1edf2d765f015237b22e432c2a96ca9e Mon Sep 17 00:00:00 2001 From: Dahlular Date: Wed, 22 Jul 2020 09:50:21 -0600 Subject: [PATCH 4/4] Fixes stepping lines --- hyperstation/code/modules/resize/resizing.dm | 36 +++++++------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index 2e2e0a99..d09327ba 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -76,11 +76,9 @@ mob/living/get_effective_size() //Smaller person being stepped on if(get_effective_size() > tmob.get_effective_size() && iscarbon(src)) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - to_chat(H,"You carefully slither around [tmob].") - to_chat(tmob,"[H]'s huge tail slithers beside you!") + H.visible_message("[H]'s huge tail slithers besides you.", "[H] carefully slithers around [tmob].") else - to_chat(H,"You carefully step over [tmob].") - to_chat(tmob,"[H] steps over you carefully!") + H.visible_message("[H] steps over you carefully.", "[H] carefully steps over [tmob].") return 1 //Smaller person stepping under a larger person @@ -120,11 +118,9 @@ mob/living/get_effective_size() addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 3) //0.3 seconds if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - to_chat(H,"You carefully roll over [tmob] with your tail!") - to_chat(tmob,"[H]'s huge tail rolls over you!") + H.visible_message("[H]'s huge tail rolls over you!", "[H] carefully rolls their tail over [tmob]!") else - to_chat(H,"You painfully but harmlessly step on [tmob]!") - to_chat(tmob,"[H] steps onto you with force!") + H.visible_message("[H] steps onto you with force!", "[H] carefully steps on [tmob]!") return 1 if(H.a_intent == "harm" && H.canmove && !H.buckled) @@ -137,11 +133,9 @@ mob/living/get_effective_size() //H.Stun(20) if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - to_chat(H,"You grind [tmob] into the floor with your tail!") - to_chat(tmob,"[H]'s massive tail plows you into the floor!") + H.visible_message("[H] plows their tail over you mercilessly!", "[H] mows down [tmob] under their tail!") else - to_chat(H,"You pound [tmob] into the floor underfoot!") - to_chat(tmob,"[H] slams you into the ground, crushing you!") + H.visible_message("[H] crushes you under their foot!", "[H] slams their foot down on [tmob]!") return 1 if(H.a_intent == "grab" && H.canmove && !H.buckled) @@ -155,20 +149,16 @@ mob/living/get_effective_size() var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET) || (H.shoes && (H.shoes.body_parts_covered & FEET))) if(feetCover) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - to_chat(H,"You pin [tmob] underneath your tail!") - to_chat(tmob,"[H]'s plows you into the ground, pinning you helplessly!") + H.visible_message("[H] pins you beneath their tail!", "[H] pins [tmob] under their tail!") else - to_chat(H,"You pin [tmob] helplessly to the floor with your foot!") - to_chat(tmob,"[H] weightfully pins you to the ground!") + H.visible_message("[H] pins you underfoot!", "[H] pins [tmob] helplessly underfoot!") return 1 else if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - to_chat(H,"You curl [tmob] up in the coils of your tail!") - to_chat(tmob,"[H]'s tail winds around you and snatches you in its coils!") + H.visible_message("[H]'s tail winds around you and snatches you in its coils!", "[H] snatches up [tmob] underneath their tail!") tmob.mob_pickup_micro_feet(H) else - to_chat(H,"You stomp your foot into [tmob], curling your toes and picking them up!") - to_chat(tmob,"[H]'s toes pin you down and curl around you, picking you up!'") + H.visible_message("[H]'s toes pin you down and curl around you, picking you up!", "[H] stomps down on [tmob], curling their toes and picking them up!") tmob.mob_pickup_micro_feet(H) return 1 @@ -181,11 +171,9 @@ mob/living/get_effective_size() //smaller person stepping under another person... TO DO, fix and allow special interactions with naga legs to be seen /mob/living/proc/micro_step_under(var/mob/living/tmob) if(istype(tmob) && istype(tmob, /datum/sprite_accessory/taur/naga)) - to_chat(src,"You jump over [tmob]'s thick tail.") - to_chat(tmob,"[src] bounds over your tail.") + src.visible_message("[src] bounds over [tmob]'s tail.", "You jump over [tmob]'s thick tail.") else - to_chat(src,"You run between [tmob]'s legs.") - to_chat(tmob,"[src] runs between your legs.") + src.visible_message("[src] runs between [tmob]'s legs.", "You run between [tmob]'s legs.") //Proc for scaling stamina damage on size difference /mob/living/proc/sizediffStamLoss(var/mob/living/tmob)