mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-02 13:32:32 +00:00
More Diona Fixes (#6774)
Fixes detached nymph not having normal nymph verbs
Added new verb to Gestalt that allows to pause any regeneration.
This commit is contained in:
committed by
Erki
parent
e51ca16771
commit
e407f2a03d
@@ -247,6 +247,9 @@ var/list/diona_banned_languages = list(
|
||||
|
||||
// We cancel with regening organ, as it's meant to stop all other regenerative
|
||||
// processes. Just pray to shit the timers don't implode.
|
||||
if(DS.pause_regen)
|
||||
return
|
||||
|
||||
if(DS.regening_organ)
|
||||
diona_regen_progress(DS)
|
||||
return
|
||||
@@ -643,6 +646,7 @@ var/list/diona_banned_languages = list(
|
||||
var/datum/callback/regen_limb
|
||||
var/datum/callback/regen_extra
|
||||
var/regen_limb_progress
|
||||
var/pause_regen = FALSE
|
||||
|
||||
/datum/dionastats/Destroy()
|
||||
light_organ = null //Nulling out these references to prevent GC errors
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
verbs += /mob/living/carbon/human/proc/check_light
|
||||
verbs += /mob/living/carbon/human/proc/diona_split_nymph
|
||||
verbs += /mob/living/carbon/human/proc/diona_detach_nymph
|
||||
verbs += /mob/living/carbon/human/proc/pause_regen_process
|
||||
verbs += /mob/living/proc/devour
|
||||
|
||||
spawn(10)
|
||||
@@ -208,6 +209,15 @@
|
||||
verbs.Remove(/mob/living/carbon/human/proc/gestalt_set_name)
|
||||
|
||||
|
||||
/mob/living/carbon/human/proc/pause_regen_process()
|
||||
set name = "Halt metabolism"
|
||||
set desc = "Allows you to pause any regeneration process."
|
||||
set category = "Abilities"
|
||||
|
||||
if(DS)
|
||||
DS.pause_regen = !DS.pause_regen
|
||||
to_chat(usr, span("notice", "You have [!DS.pause_regen ? "started" : "paused"] regeneration process."))
|
||||
|
||||
/mob/living/carbon/human/proc/diona_detach_nymph()
|
||||
set name = "Detach nymph"
|
||||
set desc = "Allows you to detach specific nymph, and control it."
|
||||
@@ -263,8 +273,8 @@
|
||||
M.verbs += /mob/living/carbon/alien/diona/proc/merge_back_to_gestalt
|
||||
M.verbs += /mob/living/carbon/alien/diona/proc/switch_to_gestalt
|
||||
verbs += /mob/living/carbon/human/proc/switch_to_nymph
|
||||
M.update_verbs(TRUE)
|
||||
M.detached = TRUE
|
||||
M.update_verbs(TRUE)
|
||||
|
||||
update_dionastats() //Re-find the organs in case they were lost or regained
|
||||
nutrition -= REGROW_FOOD_REQ
|
||||
|
||||
Reference in New Issue
Block a user