From 977080b9ee04fd8b7b3733d3027e87e6f7a212d5 Mon Sep 17 00:00:00 2001 From: Casey Date: Mon, 28 Mar 2022 19:05:19 -0400 Subject: [PATCH 01/10] Xenochimera QOL PR --- code/_onclick/hud/alert.dm | 4 ++ code/_onclick/hud/alert_vr.dm | 6 +++ code/_onclick/hud/screen_objects_vr.dm | 12 +++++ code/game/objects/items/devices/defib.dm | 8 ++++ code/game/objects/items/devices/scanners.dm | 8 ++++ .../station/station_special_abilities_vr.dm | 47 +++++++++++++++++++ .../species/station/station_special_vr.dm | 33 +++++++++++++ code/modules/mob/living/carbon/lick_wounds.dm | 8 ++++ code/modules/vore/eating/living_vr.dm | 14 ++++++ 9 files changed, 140 insertions(+) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 3449bf4c47..7c965ae68e 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -471,7 +471,11 @@ so as to remain in compliance with the most up-to-date laws." return if(master) return usr.client.Click(master, location, control, params) +<<<<<<< HEAD ..() // CHOMPStation Edit: Pass through to click_vr +======= + ..() // VOREStation Edit: Pass through to click_vr +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /obj/screen/alert/Destroy() ..() diff --git a/code/_onclick/hud/alert_vr.dm b/code/_onclick/hud/alert_vr.dm index 4255be312e..77d8c6a5cb 100644 --- a/code/_onclick/hud/alert_vr.dm +++ b/code/_onclick/hud/alert_vr.dm @@ -24,7 +24,10 @@ name = "Low Power" desc = "Your battery is very low! Low power mode makes all movements slower." +<<<<<<< HEAD // CHOMPEdit Start +======= +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /obj/screen/alert/xenochimera/reconstitution name = "Reconstructing Form" desc = "You're still rebuilding your body! Click the alert to find out how long you have left." @@ -51,5 +54,8 @@ if(istype(H) && istype(H.species, /datum/species/xenochimera)) // If you're somehow able to click this while not a chimera, this should prevent weird runtimes. Will need changing if regeneration is ever opened to non-chimera using the same alert. if(H.revive_ready == REVIVING_DONE) // Sanity check. H.hatch() // Hatch. +<<<<<<< HEAD // CHOMPEdit Finish +======= +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol */ \ No newline at end of file diff --git a/code/_onclick/hud/screen_objects_vr.dm b/code/_onclick/hud/screen_objects_vr.dm index 69555eb61b..0305309c11 100644 --- a/code/_onclick/hud/screen_objects_vr.dm +++ b/code/_onclick/hud/screen_objects_vr.dm @@ -45,14 +45,22 @@ var/turf/T = get_turf(H) if(T.get_lumcount() <= 0.1) to_chat(usr, "You are slowly calming down in darkness' safety...") +<<<<<<< HEAD else if(isbelly(H.loc)) // CHOMPEdit: Safety message for if inside a belly. +======= + else if(isbelly(H.loc)) // Safety message for if inside a belly. +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol to_chat(usr, "You are slowly calming down within the darkness of something's belly, listening to their body as it moves around you. ...safe...") else to_chat(usr, "You are slowly calming down... But safety of darkness is much preferred.") else if(H.nutrition < 150) to_chat(usr, "Your hunger is slowly making you unstable.") +<<<<<<< HEAD if("Reconstructing Form") // CHOMPEdit: Allow Viewing Reconstruction Timer + Hatching for 'chimera +======= + if("Reconstructing Form") // Allow Viewing Reconstruction Timer + Hatching for 'chimera +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol var/mob/living/carbon/human/H = usr if(istype(H) && istype(H.species, /datum/species/xenochimera)) // If you're somehow able to click this while not a chimera, this should prevent weird runtimes. Will need changing if regeneration is ever opened to non-chimera using the same alert. if(H.revive_ready == REVIVING_NOW) @@ -60,7 +68,11 @@ else if(H.revive_ready == REVIVING_DONE) to_chat(usr, "You should have a notification + alert for this! Bug report that this is still here!") +<<<<<<< HEAD if("Ready to Hatch") // CHOMPEdit: Allow Viewing Reconstruction Timer + Hatching for 'chimera +======= + if("Ready to Hatch") // Allow Viewing Reconstruction Timer + Hatching for 'chimera +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol var/mob/living/carbon/human/H = usr if(istype(H) && istype(H.species, /datum/species/xenochimera)) // If you're somehow able to click this while not a chimera, this should prevent weird runtimes. Will need changing if regeneration is ever opened to non-chimera using the same alert. if(H.revive_ready == REVIVING_DONE) // Sanity check. diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 717ceb1ee2..8ba83d25d6 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -501,10 +501,18 @@ M.Weaken(rand(10,25)) M.updatehealth() apply_brain_damage(M) +<<<<<<< HEAD M.adjustHalLoss(40) // CHOMPEdit: Moderate amount of halloss for EVERYONE being defibbed. Defibs feel like being kicked in the chest by a mule. Shit hurts if you're awake. if(istype(M.species, /datum/species/xenochimera)) // Only do the following to Xenochimera. Handwave this however you want, this is to balance defibs on an alien race. CHOMPEdit M.adjustHalLoss(220) // This hurts a LOT, stacks on top of the previous halloss. M.feral += 100 // If they somehow weren't already feral, force them feral by increasing ferality var directly, to avoid any messy checks. handle_feralness() will immediately set our feral properly according to halloss anyhow. +======= + // VOREStation Edits Start: Defib pain + if(istype(M.species, /datum/species/xenochimera)) // Only do the following to Xenochimera. Handwave this however you want, this is to balance defibs on an alien race. + M.adjustHalLoss(220) // This hurts a LOT, stacks on top of the previous halloss. + M.feral += 100 // If they somehow weren't already feral, force them feral by increasing ferality var directly, to avoid any messy checks. handle_feralness() will immediately set our feral properly according to halloss anyhow. + // VOREStation Edits End +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol // SSgame_master.adjust_danger(-20) // VOREStation Edit - We don't use SSgame_master yet. /obj/item/weapon/shockpaddles/proc/apply_brain_damage(mob/living/carbon/human/H) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 7e75e5057a..fb5ac96a6f 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -278,7 +278,11 @@ HALOGEN COUNTER - Radcount on mobs else dat += "Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]
" dat += "Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm." +<<<<<<< HEAD if(istype(H.species, /datum/species/xenochimera)) // CHOMPEdit Start: Visible feedback for medmains on Xenochimera. +======= + if(istype(H.species, /datum/species/xenochimera)) // VOREStation Edit Start: Visible feedback for medmains on Xenochimera. +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol if(H.stat == DEAD && H.revive_ready == REVIVING_READY && !H.hasnutriment()) dat += "WARNING: Protein levels low. Subject incapable of reconstitution." else if(H.revive_ready == REVIVING_NOW) @@ -289,7 +293,11 @@ HALOGEN COUNTER - Radcount on mobs dat+= "WARNING: Defib will cause extreme pain and set subject feral. Sedation recommended prior to defibrillation." else // If they bop them and they're not dead or reviving, give 'em a little notice. dat += "Subject is a Xenochimera. Treat accordingly." +<<<<<<< HEAD // CHOMPEdit End +======= + // VOREStation Edit End +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol user.show_message(dat, 1) /obj/item/device/healthanalyzer/verb/toggle_mode() diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index c401019f21..2c242c24ce 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -34,14 +34,23 @@ //Scary spawnerization. revive_ready = REVIVING_NOW revive_finished = (world.time + time SECONDS) // When do we finish reviving? Allows us to find out when we're done, called by the alert currently. +<<<<<<< HEAD throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution) // CHOMPEdit: Regen +======= + throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution) +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol spawn(time SECONDS) // Was dead, now not dead. if(stat != DEAD) to_chat(src, "Your body has recovered from its ordeal, ready to regenerate itself again.") revive_ready = REVIVING_READY //reset their cooldown +<<<<<<< HEAD clear_alert("regen") // CHOMPEdit: Regen throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) // CHOMPEdit: Regen +======= + clear_alert("regen") + throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol // Was dead, still dead. else @@ -49,8 +58,13 @@ verbs |= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_DONE src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30) +<<<<<<< HEAD clear_alert("regen") // CHOMPEdit: Regen throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) // CHOMPEdit: Regen +======= + clear_alert("regen") + throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Dead until nutrition injected. else @@ -63,7 +77,11 @@ //Waiting for regen after being alive revive_ready = REVIVING_NOW revive_finished = (world.time + time SECONDS) // When do we finish reviving? Allows us to find out when we're done, called by the alert currently. +<<<<<<< HEAD throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution) // CHOMPEdit: Regen +======= + throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution) +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol spawn(time SECONDS) //If they're still alive after regenning. @@ -72,8 +90,13 @@ verbs |= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_DONE src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30) +<<<<<<< HEAD clear_alert("regen") // CHOMPEdit: Regen throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) // CHOMPEdit: Regen +======= + clear_alert("regen") + throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Was alive, now dead else if(hasnutriment()) @@ -81,14 +104,23 @@ verbs |= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_DONE src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30) +<<<<<<< HEAD clear_alert("regen") // CHOMPEdit: Regen throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) // CHOMPEdit: Regen +======= + clear_alert("regen") + throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Dead until nutrition injected. else to_chat(src, "Your body was unable to regenerate, what few living cells remain require additional nutrients to complete the process.") revive_ready = REVIVING_READY //reset their cooldown +<<<<<<< HEAD clear_alert("regen") // CHOMPEdit: Regen +======= + clear_alert("regen") +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /mob/living/carbon/human/proc/hasnutriment() if (bloodstr.has_reagent("nutriment", 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein. @@ -117,7 +149,11 @@ chimera_hatch() adjustBrainLoss(10) // if they're reviving from dead, they come back with 10 brainloss on top of whatever's unhealed. visible_message("

The lifeless husk of [src] bursts open, revealing a new, intact copy in the pool of viscera.

") //Bloody hell... +<<<<<<< HEAD clear_alert("hatch") // CHOMPEdit: Regen +======= + clear_alert("hatch") +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol return //Don't have nutriment to hatch! Or you somehow died in between completing your revive and hitting hatch. @@ -125,13 +161,21 @@ to_chat(src, "Your body was unable to regenerate, what few living cells remain require additional nutrients to complete the process.") verbs -= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_READY //reset their cooldown they can try again when they're given a kickstart +<<<<<<< HEAD clear_alert("hatch") // CHOMPEdit: Regen +======= + clear_alert("hatch") +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Alive when hatching else chimera_hatch() visible_message("

The dormant husk of [src] bursts open, revealing a new, intact copy in the pool of viscera.

") //Bloody hell... +<<<<<<< HEAD clear_alert("hatch") // CHOMPEdit: Regen +======= + clear_alert("hatch") +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /mob/living/carbon/human/proc/chimera_hatch() verbs -= /mob/living/carbon/human/proc/hatch @@ -166,7 +210,10 @@ playsound(T, 'sound/effects/mob_effects/xenochimera/hatch.ogg', 50) revive_ready = world.time + 10 MINUTES //set the cooldown CHOMPEdit: Reduced this to 10 minutes, you're playing with fire if you're reviving that often. +<<<<<<< HEAD // CHOMPEdit End +======= +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /mob/living/carbon/human/proc/revivingreset() // keep this as a debug proc or potential future use revive_ready = REVIVING_READY diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index b3574568c8..15b03c3ace 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -27,9 +27,13 @@ /mob/living/carbon/human/proc/sonar_ping, /mob/living/carbon/human/proc/tie_hair, /mob/living/proc/flying_toggle, +<<<<<<< HEAD /mob/living/proc/start_wings_hovering, /mob/living/carbon/human/proc/lick_wounds) //Xenochimera get all the special verbs since they can't select traits. // CHOMPEdit: Lick Wounds Verb +======= + /mob/living/proc/start_wings_hovering) //Xenochimera get all the special verbs since they can't select traits. +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol virus_immune = 1 // They practically ARE one. min_age = 18 @@ -55,7 +59,11 @@ //primitive_form = "Farwa" spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE//Whitelisted as restricted is broken. +<<<<<<< HEAD flags = NO_SCAN | NO_INFECT // | NO_DEFIB // Dying as a chimera is, quite literally, a death sentence. Well, if it wasn't for their revive, that is. CHOMPEdit: Leaving NO_DEFIB there for the future. // CHOMPEdit: Adds flags +======= + flags = NO_SCAN | NO_INFECT // | NO_DEFIB // Dying as a chimera is, quite literally, a death sentence. Well, if it wasn't for their revive, that is. Leaving NO_DEFIB there for the future/in case reversion to old 'chimera no-defib. +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR genders = list(MALE, FEMALE, PLURAL, NEUTER) @@ -88,11 +96,18 @@ H.weakened = 5 H.canmove = 0 H.does_not_breathe = TRUE +<<<<<<< HEAD var/regen_sounds = H.regen_sounds // CHOMPEdit Start: Regen sounds/etc if(prob(2)) // 2% chance of playing squelchy noise while reviving, which is run roughly every 2 seconds/tick while regenerating. playsound(H, pick(regen_sounds), 30) H.visible_message("

[H.name]'s motionless form shudders grotesquely, rippling unnaturally.

") // CHOMPEdit End +======= + var/regen_sounds = H.regen_sounds + if(prob(2)) // 2% chance of playing squelchy noise while reviving, which is run roughly every 2 seconds/tick while regenerating. + playsound(H, pick(regen_sounds), 30) + H.visible_message("

[H.name]'s motionless form shudders grotesquely, rippling unnaturally.

") +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Cold/pressure effects when not regenerating else @@ -212,8 +227,13 @@ feral++ else feral = max(0,--feral) +<<<<<<< HEAD // Being in a belly or in the darkness decreases stress further. :9 +======= + + // Being in a belly or in the darkness decreases stress further. Helps mechanically reward players for staying in darkness + RP'ing appropriately. :9 +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol var/turf/T = get_turf(H) if(feral && (isbelly(H.loc) || T.get_lumcount() <= 0.1)) feral = max(0,--feral) @@ -233,7 +253,11 @@ H.shock_stage = max(H.shock_stage-(feral/20), 0) //Handle light/dark areas +<<<<<<< HEAD // var/turf/T = get_turf(H) // CHOMPEdit: Moved up to before the in-belly/dark combined check, should still safely reach here just fine. +======= + // var/turf/T = get_turf(H) // Moved up to before the in-belly/dark combined check, should still safely reach here just fine. +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol if(!T) update_xenochimera_hud(H, danger, feral_state) return //Nullspace @@ -246,7 +270,11 @@ var/list/nearby = H.living_mobs(world.view) //Not in the dark, or a belly, and out in the open. +<<<<<<< HEAD if(!darkish && isturf(H.loc) && !isbelly(H.loc)) // CHOMPEdit: added specific check for if in belly +======= + if(!darkish && isturf(H.loc) && !isbelly(H.loc)) // Added specific check for if in belly +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Always handle feral if nobody's around and not in the dark. if(!nearby.len) @@ -260,8 +288,13 @@ update_xenochimera_hud(H, danger, feral_state) return +<<<<<<< HEAD // In the darkness, "hidden", or in a belly. No need for custom scene-protection checks as it's just an occational infomessage. if(darkish || !isturf(H.loc) || isbelly(H.loc)) // CHOMPEdit: added specific check for if in belly +======= + // In the darkness, or "hidden", or in a belly. No need for custom scene-protection checks as it's just an occational infomessage. + if(darkish || !isturf(H.loc) || isbelly(H.loc)) // Specific check for if in belly. !isturf should do this, but JUST in case. +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol // If hurt, tell 'em to heal up if (shock) to_chat(H,"This place seems safe, secure, hidden, a place to lick your wounds and recover...") diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index b11ece455a..9579bcf5ec 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -1,4 +1,8 @@ +<<<<<<< HEAD /mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M) //YWedit, originally, living/carbon/M in living_mobs(1), However, living_mobs does not include src as possible target. +======= +/mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M) // Allows the user to lick themselves. Given how rarely this trait is used, I don't see an issue with a slight buff. +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol set name = "Lick Wounds" set category = "Abilities" set desc = "Disinfect and heal small wounds with your saliva." @@ -11,6 +15,10 @@ to_chat(src, "You need to be closer to do that.") // CHOMPEdit - don't use src << unless you have to. return + if (get_dist(src,M) >= 2) + to_chat(src, "You need to be closer to do that.") + return + if ( ! (istype(src, /mob/living/carbon/human) || \ istype(src, /mob/living/silicon)) ) to_chat(src, "If you even have a tongue, it doesn't work that way.") diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 86c5451629..9bb4f90dda 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -20,7 +20,11 @@ var/vore_egg_type = "egg" // Default egg type. var/feral = 0 // How feral the mob is, if at all. Does nothing for non xenochimera at the moment. var/revive_ready = REVIVING_READY // Only used for creatures that have the xenochimera regen ability, so far. +<<<<<<< HEAD var/revive_finished = 0 // CHOMPEdit: Only used for xenochimera regen, allows us to find out when the regen will finish. +======= + var/revive_finished = 0 // Only used for xenochimera regen, allows us to find out when the regen will finish. +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol var/metabolism = 0.0015 var/vore_taste = null // What the character tastes like var/vore_smell = null // What the character smells like @@ -38,6 +42,7 @@ var/adminbus_eat_minerals = FALSE // This creature subsists on a diet of pure adminium. var/vis_height = 32 // Sprite height used for resize features. var/show_vore_fx = TRUE // Show belly fullscreens +<<<<<<< HEAD var/latejoin_vore = FALSE //CHOMPedit: If enabled, latejoiners can spawn into this, assuming they have a client var/latejoin_prey = FALSE //CHOMPedit: If enabled, latejoiners can spawn ontop of and instantly eat the victim var/noisy_full = FALSE //CHOMPedit: Enables belching when a mob has overeaten @@ -50,6 +55,15 @@ 'sound/effects/mob_effects/xenochimera/regen_5.ogg' ) // CHOMPEdit: Regen Sounds +======= + var/regen_sounds = list( + 'sound/effects/mob_effects/xenochimera/regen_1.ogg', + 'sound/effects/mob_effects/xenochimera/regen_2.ogg', + 'sound/effects/mob_effects/xenochimera/regen_4.ogg', + 'sound/effects/mob_effects/xenochimera/regen_3.ogg', + 'sound/effects/mob_effects/xenochimera/regen_5.ogg' + ) +>>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol // // Hook for generic creation of stuff on new creatures From 967186aeb65fe71e7f86139ad2742d862d6c6a7c Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 30 Mar 2022 21:55:39 -0700 Subject: [PATCH 02/10] powder that makes you say yes --- code/_onclick/hud/alert.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 7c965ae68e..4689863245 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -471,11 +471,7 @@ so as to remain in compliance with the most up-to-date laws." return if(master) return usr.client.Click(master, location, control, params) -<<<<<<< HEAD - ..() // CHOMPStation Edit: Pass through to click_vr -======= ..() // VOREStation Edit: Pass through to click_vr ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /obj/screen/alert/Destroy() ..() From 2012d9a6fff60023ce474c05a4367e762eab61af Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 30 Mar 2022 21:56:16 -0700 Subject: [PATCH 03/10] powder that makes you say yes --- code/_onclick/hud/alert_vr.dm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/code/_onclick/hud/alert_vr.dm b/code/_onclick/hud/alert_vr.dm index 77d8c6a5cb..e4168c3971 100644 --- a/code/_onclick/hud/alert_vr.dm +++ b/code/_onclick/hud/alert_vr.dm @@ -24,10 +24,6 @@ name = "Low Power" desc = "Your battery is very low! Low power mode makes all movements slower." -<<<<<<< HEAD -// CHOMPEdit Start -======= ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /obj/screen/alert/xenochimera/reconstitution name = "Reconstructing Form" desc = "You're still rebuilding your body! Click the alert to find out how long you have left." @@ -54,8 +50,4 @@ if(istype(H) && istype(H.species, /datum/species/xenochimera)) // If you're somehow able to click this while not a chimera, this should prevent weird runtimes. Will need changing if regeneration is ever opened to non-chimera using the same alert. if(H.revive_ready == REVIVING_DONE) // Sanity check. H.hatch() // Hatch. -<<<<<<< HEAD -// CHOMPEdit Finish -======= ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol -*/ \ No newline at end of file +*/ From 80e65fa5780592f0e93193b40d26b87ade730308 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 30 Mar 2022 21:56:57 -0700 Subject: [PATCH 04/10] powder that makes you say yes --- code/_onclick/hud/screen_objects_vr.dm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/code/_onclick/hud/screen_objects_vr.dm b/code/_onclick/hud/screen_objects_vr.dm index 0305309c11..65b6df5c3b 100644 --- a/code/_onclick/hud/screen_objects_vr.dm +++ b/code/_onclick/hud/screen_objects_vr.dm @@ -45,22 +45,15 @@ var/turf/T = get_turf(H) if(T.get_lumcount() <= 0.1) to_chat(usr, "You are slowly calming down in darkness' safety...") -<<<<<<< HEAD - else if(isbelly(H.loc)) // CHOMPEdit: Safety message for if inside a belly. -======= + else if(isbelly(H.loc)) // Safety message for if inside a belly. ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol to_chat(usr, "You are slowly calming down within the darkness of something's belly, listening to their body as it moves around you. ...safe...") else to_chat(usr, "You are slowly calming down... But safety of darkness is much preferred.") else if(H.nutrition < 150) to_chat(usr, "Your hunger is slowly making you unstable.") -<<<<<<< HEAD - if("Reconstructing Form") // CHOMPEdit: Allow Viewing Reconstruction Timer + Hatching for 'chimera -======= if("Reconstructing Form") // Allow Viewing Reconstruction Timer + Hatching for 'chimera ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol var/mob/living/carbon/human/H = usr if(istype(H) && istype(H.species, /datum/species/xenochimera)) // If you're somehow able to click this while not a chimera, this should prevent weird runtimes. Will need changing if regeneration is ever opened to non-chimera using the same alert. if(H.revive_ready == REVIVING_NOW) @@ -68,11 +61,7 @@ else if(H.revive_ready == REVIVING_DONE) to_chat(usr, "You should have a notification + alert for this! Bug report that this is still here!") -<<<<<<< HEAD - if("Ready to Hatch") // CHOMPEdit: Allow Viewing Reconstruction Timer + Hatching for 'chimera -======= if("Ready to Hatch") // Allow Viewing Reconstruction Timer + Hatching for 'chimera ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol var/mob/living/carbon/human/H = usr if(istype(H) && istype(H.species, /datum/species/xenochimera)) // If you're somehow able to click this while not a chimera, this should prevent weird runtimes. Will need changing if regeneration is ever opened to non-chimera using the same alert. if(H.revive_ready == REVIVING_DONE) // Sanity check. @@ -81,4 +70,4 @@ else return 0 - return 1 \ No newline at end of file + return 1 From 169da5b298165641c0e926a86b571b2611b2460c Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 30 Mar 2022 21:57:46 -0700 Subject: [PATCH 05/10] powder that makes you say yes --- code/game/objects/items/devices/defib.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 8ba83d25d6..f672cbcf1b 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -501,18 +501,12 @@ M.Weaken(rand(10,25)) M.updatehealth() apply_brain_damage(M) -<<<<<<< HEAD M.adjustHalLoss(40) // CHOMPEdit: Moderate amount of halloss for EVERYONE being defibbed. Defibs feel like being kicked in the chest by a mule. Shit hurts if you're awake. - if(istype(M.species, /datum/species/xenochimera)) // Only do the following to Xenochimera. Handwave this however you want, this is to balance defibs on an alien race. CHOMPEdit - M.adjustHalLoss(220) // This hurts a LOT, stacks on top of the previous halloss. - M.feral += 100 // If they somehow weren't already feral, force them feral by increasing ferality var directly, to avoid any messy checks. handle_feralness() will immediately set our feral properly according to halloss anyhow. -======= // VOREStation Edits Start: Defib pain if(istype(M.species, /datum/species/xenochimera)) // Only do the following to Xenochimera. Handwave this however you want, this is to balance defibs on an alien race. M.adjustHalLoss(220) // This hurts a LOT, stacks on top of the previous halloss. M.feral += 100 // If they somehow weren't already feral, force them feral by increasing ferality var directly, to avoid any messy checks. handle_feralness() will immediately set our feral properly according to halloss anyhow. // VOREStation Edits End ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol // SSgame_master.adjust_danger(-20) // VOREStation Edit - We don't use SSgame_master yet. /obj/item/weapon/shockpaddles/proc/apply_brain_damage(mob/living/carbon/human/H) From 7f418fd1fa6bdaa5d325f20031927cca544426f5 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 30 Mar 2022 21:58:16 -0700 Subject: [PATCH 06/10] powder that makes you say yes --- code/game/objects/items/devices/scanners.dm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index fb5ac96a6f..b240af4dd6 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -278,11 +278,7 @@ HALOGEN COUNTER - Radcount on mobs else dat += "Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]
" dat += "Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm." -<<<<<<< HEAD - if(istype(H.species, /datum/species/xenochimera)) // CHOMPEdit Start: Visible feedback for medmains on Xenochimera. -======= if(istype(H.species, /datum/species/xenochimera)) // VOREStation Edit Start: Visible feedback for medmains on Xenochimera. ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol if(H.stat == DEAD && H.revive_ready == REVIVING_READY && !H.hasnutriment()) dat += "WARNING: Protein levels low. Subject incapable of reconstitution." else if(H.revive_ready == REVIVING_NOW) @@ -293,11 +289,7 @@ HALOGEN COUNTER - Radcount on mobs dat+= "WARNING: Defib will cause extreme pain and set subject feral. Sedation recommended prior to defibrillation." else // If they bop them and they're not dead or reviving, give 'em a little notice. dat += "Subject is a Xenochimera. Treat accordingly." -<<<<<<< HEAD - // CHOMPEdit End -======= // VOREStation Edit End ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol user.show_message(dat, 1) /obj/item/device/healthanalyzer/verb/toggle_mode() @@ -553,4 +545,4 @@ HALOGEN COUNTER - Radcount on mobs to_chat(user, "No radiation detected.") return -#undef DEFIB_TIME_LIMIT //VOREStation addition \ No newline at end of file +#undef DEFIB_TIME_LIMIT //VOREStation addition From 85d7dce3d1b5412fb8d51085afce1d64ec47e73b Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 30 Mar 2022 22:00:13 -0700 Subject: [PATCH 07/10] powder that makes you say yes --- .../station/station_special_abilities_vr.dm | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index 2c242c24ce..2697df5f84 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -34,23 +34,14 @@ //Scary spawnerization. revive_ready = REVIVING_NOW revive_finished = (world.time + time SECONDS) // When do we finish reviving? Allows us to find out when we're done, called by the alert currently. -<<<<<<< HEAD - throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution) // CHOMPEdit: Regen -======= throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution) ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol spawn(time SECONDS) // Was dead, now not dead. if(stat != DEAD) to_chat(src, "Your body has recovered from its ordeal, ready to regenerate itself again.") revive_ready = REVIVING_READY //reset their cooldown -<<<<<<< HEAD - clear_alert("regen") // CHOMPEdit: Regen - throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) // CHOMPEdit: Regen -======= clear_alert("regen") throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol // Was dead, still dead. else @@ -58,13 +49,8 @@ verbs |= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_DONE src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30) -<<<<<<< HEAD - clear_alert("regen") // CHOMPEdit: Regen - throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) // CHOMPEdit: Regen -======= clear_alert("regen") throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Dead until nutrition injected. else @@ -77,11 +63,7 @@ //Waiting for regen after being alive revive_ready = REVIVING_NOW revive_finished = (world.time + time SECONDS) // When do we finish reviving? Allows us to find out when we're done, called by the alert currently. -<<<<<<< HEAD - throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution) // CHOMPEdit: Regen -======= throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution) ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol spawn(time SECONDS) //If they're still alive after regenning. @@ -90,13 +72,8 @@ verbs |= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_DONE src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30) -<<<<<<< HEAD - clear_alert("regen") // CHOMPEdit: Regen - throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) // CHOMPEdit: Regen -======= clear_alert("regen") throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Was alive, now dead else if(hasnutriment()) @@ -104,23 +81,14 @@ verbs |= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_DONE src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30) -<<<<<<< HEAD - clear_alert("regen") // CHOMPEdit: Regen - throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) // CHOMPEdit: Regen -======= clear_alert("regen") throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Dead until nutrition injected. else to_chat(src, "Your body was unable to regenerate, what few living cells remain require additional nutrients to complete the process.") revive_ready = REVIVING_READY //reset their cooldown -<<<<<<< HEAD - clear_alert("regen") // CHOMPEdit: Regen -======= clear_alert("regen") ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /mob/living/carbon/human/proc/hasnutriment() if (bloodstr.has_reagent("nutriment", 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein. @@ -149,11 +117,7 @@ chimera_hatch() adjustBrainLoss(10) // if they're reviving from dead, they come back with 10 brainloss on top of whatever's unhealed. visible_message("

The lifeless husk of [src] bursts open, revealing a new, intact copy in the pool of viscera.

") //Bloody hell... -<<<<<<< HEAD - clear_alert("hatch") // CHOMPEdit: Regen -======= clear_alert("hatch") ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol return //Don't have nutriment to hatch! Or you somehow died in between completing your revive and hitting hatch. @@ -161,21 +125,13 @@ to_chat(src, "Your body was unable to regenerate, what few living cells remain require additional nutrients to complete the process.") verbs -= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_READY //reset their cooldown they can try again when they're given a kickstart -<<<<<<< HEAD - clear_alert("hatch") // CHOMPEdit: Regen -======= clear_alert("hatch") ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Alive when hatching else chimera_hatch() visible_message("

The dormant husk of [src] bursts open, revealing a new, intact copy in the pool of viscera.

") //Bloody hell... -<<<<<<< HEAD - clear_alert("hatch") // CHOMPEdit: Regen -======= clear_alert("hatch") ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /mob/living/carbon/human/proc/chimera_hatch() verbs -= /mob/living/carbon/human/proc/hatch @@ -210,10 +166,6 @@ playsound(T, 'sound/effects/mob_effects/xenochimera/hatch.ogg', 50) revive_ready = world.time + 10 MINUTES //set the cooldown CHOMPEdit: Reduced this to 10 minutes, you're playing with fire if you're reviving that often. -<<<<<<< HEAD - // CHOMPEdit End -======= ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol /mob/living/carbon/human/proc/revivingreset() // keep this as a debug proc or potential future use revive_ready = REVIVING_READY From 44a98db35c0c17ed67050e88b26d37077de1a847 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 30 Mar 2022 22:01:27 -0700 Subject: [PATCH 08/10] powder that makes you say yes --- .../species/station/station_special_vr.dm | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index 15b03c3ace..5e099d6dce 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -27,13 +27,9 @@ /mob/living/carbon/human/proc/sonar_ping, /mob/living/carbon/human/proc/tie_hair, /mob/living/proc/flying_toggle, -<<<<<<< HEAD /mob/living/proc/start_wings_hovering, /mob/living/carbon/human/proc/lick_wounds) //Xenochimera get all the special verbs since they can't select traits. // CHOMPEdit: Lick Wounds Verb -======= - /mob/living/proc/start_wings_hovering) //Xenochimera get all the special verbs since they can't select traits. ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol virus_immune = 1 // They practically ARE one. min_age = 18 @@ -59,11 +55,7 @@ //primitive_form = "Farwa" spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE//Whitelisted as restricted is broken. -<<<<<<< HEAD - flags = NO_SCAN | NO_INFECT // | NO_DEFIB // Dying as a chimera is, quite literally, a death sentence. Well, if it wasn't for their revive, that is. CHOMPEdit: Leaving NO_DEFIB there for the future. // CHOMPEdit: Adds flags -======= flags = NO_SCAN | NO_INFECT // | NO_DEFIB // Dying as a chimera is, quite literally, a death sentence. Well, if it wasn't for their revive, that is. Leaving NO_DEFIB there for the future/in case reversion to old 'chimera no-defib. ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR genders = list(MALE, FEMALE, PLURAL, NEUTER) @@ -96,18 +88,10 @@ H.weakened = 5 H.canmove = 0 H.does_not_breathe = TRUE -<<<<<<< HEAD - var/regen_sounds = H.regen_sounds // CHOMPEdit Start: Regen sounds/etc - if(prob(2)) // 2% chance of playing squelchy noise while reviving, which is run roughly every 2 seconds/tick while regenerating. - playsound(H, pick(regen_sounds), 30) - H.visible_message("

[H.name]'s motionless form shudders grotesquely, rippling unnaturally.

") - // CHOMPEdit End -======= var/regen_sounds = H.regen_sounds if(prob(2)) // 2% chance of playing squelchy noise while reviving, which is run roughly every 2 seconds/tick while regenerating. playsound(H, pick(regen_sounds), 30) H.visible_message("

[H.name]'s motionless form shudders grotesquely, rippling unnaturally.

") ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Cold/pressure effects when not regenerating else @@ -227,13 +211,8 @@ feral++ else feral = max(0,--feral) -<<<<<<< HEAD - - // Being in a belly or in the darkness decreases stress further. :9 -======= // Being in a belly or in the darkness decreases stress further. Helps mechanically reward players for staying in darkness + RP'ing appropriately. :9 ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol var/turf/T = get_turf(H) if(feral && (isbelly(H.loc) || T.get_lumcount() <= 0.1)) feral = max(0,--feral) @@ -253,11 +232,7 @@ H.shock_stage = max(H.shock_stage-(feral/20), 0) //Handle light/dark areas -<<<<<<< HEAD - // var/turf/T = get_turf(H) // CHOMPEdit: Moved up to before the in-belly/dark combined check, should still safely reach here just fine. -======= // var/turf/T = get_turf(H) // Moved up to before the in-belly/dark combined check, should still safely reach here just fine. ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol if(!T) update_xenochimera_hud(H, danger, feral_state) return //Nullspace @@ -270,11 +245,7 @@ var/list/nearby = H.living_mobs(world.view) //Not in the dark, or a belly, and out in the open. -<<<<<<< HEAD - if(!darkish && isturf(H.loc) && !isbelly(H.loc)) // CHOMPEdit: added specific check for if in belly -======= if(!darkish && isturf(H.loc) && !isbelly(H.loc)) // Added specific check for if in belly ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol //Always handle feral if nobody's around and not in the dark. if(!nearby.len) @@ -288,13 +259,8 @@ update_xenochimera_hud(H, danger, feral_state) return -<<<<<<< HEAD - // In the darkness, "hidden", or in a belly. No need for custom scene-protection checks as it's just an occational infomessage. - if(darkish || !isturf(H.loc) || isbelly(H.loc)) // CHOMPEdit: added specific check for if in belly -======= // In the darkness, or "hidden", or in a belly. No need for custom scene-protection checks as it's just an occational infomessage. if(darkish || !isturf(H.loc) || isbelly(H.loc)) // Specific check for if in belly. !isturf should do this, but JUST in case. ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol // If hurt, tell 'em to heal up if (shock) to_chat(H,"This place seems safe, secure, hidden, a place to lick your wounds and recover...") From d29470aa3d7a52d922db12c3b253100477f02d2d Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 30 Mar 2022 22:02:07 -0700 Subject: [PATCH 09/10] powder that makes you say yes --- code/modules/vore/eating/living_vr.dm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 9bb4f90dda..38a10d88ec 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -20,11 +20,7 @@ var/vore_egg_type = "egg" // Default egg type. var/feral = 0 // How feral the mob is, if at all. Does nothing for non xenochimera at the moment. var/revive_ready = REVIVING_READY // Only used for creatures that have the xenochimera regen ability, so far. -<<<<<<< HEAD - var/revive_finished = 0 // CHOMPEdit: Only used for xenochimera regen, allows us to find out when the regen will finish. -======= var/revive_finished = 0 // Only used for xenochimera regen, allows us to find out when the regen will finish. ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol var/metabolism = 0.0015 var/vore_taste = null // What the character tastes like var/vore_smell = null // What the character smells like @@ -42,20 +38,10 @@ var/adminbus_eat_minerals = FALSE // This creature subsists on a diet of pure adminium. var/vis_height = 32 // Sprite height used for resize features. var/show_vore_fx = TRUE // Show belly fullscreens -<<<<<<< HEAD var/latejoin_vore = FALSE //CHOMPedit: If enabled, latejoiners can spawn into this, assuming they have a client var/latejoin_prey = FALSE //CHOMPedit: If enabled, latejoiners can spawn ontop of and instantly eat the victim var/noisy_full = FALSE //CHOMPedit: Enables belching when a mob has overeaten var/bellies_loaded = FALSE //CHOMPedit: On-demand belly loading - var/regen_sounds = list( - 'sound/effects/mob_effects/xenochimera/regen_1.ogg', - 'sound/effects/mob_effects/xenochimera/regen_2.ogg', - 'sound/effects/mob_effects/xenochimera/regen_3.ogg', - 'sound/effects/mob_effects/xenochimera/regen_4.ogg', - 'sound/effects/mob_effects/xenochimera/regen_5.ogg' - ) - // CHOMPEdit: Regen Sounds -======= var/regen_sounds = list( 'sound/effects/mob_effects/xenochimera/regen_1.ogg', 'sound/effects/mob_effects/xenochimera/regen_2.ogg', @@ -63,7 +49,6 @@ 'sound/effects/mob_effects/xenochimera/regen_3.ogg', 'sound/effects/mob_effects/xenochimera/regen_5.ogg' ) ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol // // Hook for generic creation of stuff on new creatures From 5e007bd3d9edf61aaefabc3c904b8e395c9a90a0 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Wed, 30 Mar 2022 22:06:35 -0700 Subject: [PATCH 10/10] powder that makes you say yes --- code/modules/mob/living/carbon/lick_wounds.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index 9579bcf5ec..51edc1870d 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -1,8 +1,4 @@ -<<<<<<< HEAD -/mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M) //YWedit, originally, living/carbon/M in living_mobs(1), However, living_mobs does not include src as possible target. -======= /mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M) // Allows the user to lick themselves. Given how rarely this trait is used, I don't see an issue with a slight buff. ->>>>>>> 084441d48b... Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol set name = "Lick Wounds" set category = "Abilities" set desc = "Disinfect and heal small wounds with your saliva."