From e757b64fa67d7237636ca7ee4f5734a22e65d4bb Mon Sep 17 00:00:00 2001
From: Vulpias <37509487+Vulpias@users.noreply.github.com>
Date: Thu, 16 Jan 2020 03:49:11 +0100
Subject: [PATCH 1/3] Egglaying Rework
Reworked the trait.
you can now choose to make an egg
which costs 150 nutrition (duh you need to make an shell etc.)
-capped the max eggs you can carry at 5 smalls eggs.
-you need to wait 30 seconds to make or lay an egg,
-1 min timeout so you cant spam the ability
---
.../living/carbon/human/human_defines_ch.dm | 6 ++-
.../station/station_special_abilities_ch.dm | 48 +++++++++++--------
.../species/station/traits_vr/neutral_ch.dm | 1 -
3 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/human_defines_ch.dm b/code/modules/mob/living/carbon/human/human_defines_ch.dm
index 69dfc3a7ea..f1489a81f5 100644
--- a/code/modules/mob/living/carbon/human/human_defines_ch.dm
+++ b/code/modules/mob/living/carbon/human/human_defines_ch.dm
@@ -1,2 +1,6 @@
/mob/living/carbon/human
- var/gender_change_cooldown = 0 // A cooldown for gender and gender indentify changing procs to make it easy to avoid spam of gender change
\ No newline at end of file
+ var/gender_change_cooldown = 0 // A cooldown for gender and gender indentify changing procs to make it easy to avoid spam of gender change
+
+//an add so the egglaying ability can be used withput any troubles
+/mob/living/carbon/human
+ var/eggs = 0
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_ch.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_ch.dm
index b99530ca63..97d7385d7c 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_ch.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_ch.dm
@@ -121,40 +121,50 @@ mob/living/carbon/proc/charmed() //TODO
set category = "Abilities"
var/mob/living/carbon/human/C = src
- var layeggs = 0
- var eggs = 0
- if(C.incapacitated(INCAPACITATION_ALL))
- to_chat(src, "You cannot lay eggs in this state!")
- return
- if(C.nutrition < 200)
- to_chat(src, "You lack the Nutrition to lay eggs")
+ if(last_special > world.time)
return
- layeggs++
+ var/choice = input(src, "What do you want to do?") as null|anything in list("Make a Egg", "lay your Eggs")
+ last_special = world.time + 600
- if(C.nutrition < 200)
- eggs++
+ if(!choice)
+ return
+ if(do_after(src, 300)) //Thrirty seconds.
+ if(choice == "Make a Egg")
+ src.show_message("You feel your belly bulging a bit, you made an egg!")
+ C.nutrition -=150
+ eggs += 1
+ return 0
+ else if(choice == "Make a Egg" && eggs > 5)
+ src.show_message("Your Belly is full of Eggs you cant have more!!")
+ return 0
+ else if(choice == "lay your Eggs" && eggs > 0)
+ src.visible_message("[src] freezes and vissibly tries to squat down")
- else if(C.nutrition > 200 && C.nutrition < 600)
- eggs = 2
-
-
- else if(C.nutrition >600 && C.nutrition < 800)
- eggs = 3
-
+ while(eggs > 0)
+ src.show_message("You lay a egg!")
+ eggs--
+ var/obj/item/weapon/reagent_containers/food/snacks/egg/E = new(get_turf(src))
+ E.pixel_x = rand(-6,6)
+ E.pixel_y = rand(-6,6)
+ return
+ else
+ src.visible_message("you dont have any eggs!")
+ return //Should never happen
+/*
if(layeggs == 1)
src.visible_message("[src] freezes and vissibly tries to squat down")
while(eggs > 0)
- src.show_message("You lay a egg!")
+ src.show_message("You lay you egg!")
eggs--
- C.nutrition -= 100
var/obj/item/weapon/reagent_containers/food/snacks/egg/E = new(get_turf(src))
E.pixel_x = rand(-6,6)
E.pixel_y = rand(-6,6)
layeggs--
return
+*/
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm
index 9dcb66c480..e3f8a171e9 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm
@@ -7,7 +7,6 @@
..(S,H)
H.verbs |= /mob/living/proc/mobegglaying
-
/datum/trait/succubus_bite
name = "Succubus Bite"
desc = "Allows you to inject your prey with poison, much like a venemous snake."
From 336434b68733dfaf86d822bd2ec178fef6ed49dc Mon Sep 17 00:00:00 2001
From: Vulpias <37509487+Vulpias@users.noreply.github.com>
Date: Thu, 16 Jan 2020 03:51:34 +0100
Subject: [PATCH 2/3] Fixing Spelling errors
Fixed an error
---
code/modules/mob/living/carbon/human/human_defines_ch.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/human/human_defines_ch.dm b/code/modules/mob/living/carbon/human/human_defines_ch.dm
index f1489a81f5..62447789dd 100644
--- a/code/modules/mob/living/carbon/human/human_defines_ch.dm
+++ b/code/modules/mob/living/carbon/human/human_defines_ch.dm
@@ -1,6 +1,6 @@
/mob/living/carbon/human
var/gender_change_cooldown = 0 // A cooldown for gender and gender indentify changing procs to make it easy to avoid spam of gender change
-//an add so the egglaying ability can be used withput any troubles
+//an add so the egglaying ability can be used
/mob/living/carbon/human
var/eggs = 0
\ No newline at end of file
From 4522c15730f3aa5824a04a4833030b9e367ed3ce Mon Sep 17 00:00:00 2001
From: Vulpias <37509487+Vulpias@users.noreply.github.com>
Date: Thu, 16 Jan 2020 04:13:11 +0100
Subject: [PATCH 3/3] :)
:)
---
code/modules/mob/living/carbon/human/human_defines_ch.dm | 6 +-----
.../human/species/station/station_special_abilities_ch.dm | 2 ++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/human_defines_ch.dm b/code/modules/mob/living/carbon/human/human_defines_ch.dm
index 62447789dd..69dfc3a7ea 100644
--- a/code/modules/mob/living/carbon/human/human_defines_ch.dm
+++ b/code/modules/mob/living/carbon/human/human_defines_ch.dm
@@ -1,6 +1,2 @@
/mob/living/carbon/human
- var/gender_change_cooldown = 0 // A cooldown for gender and gender indentify changing procs to make it easy to avoid spam of gender change
-
-//an add so the egglaying ability can be used
-/mob/living/carbon/human
- var/eggs = 0
\ No newline at end of file
+ var/gender_change_cooldown = 0 // A cooldown for gender and gender indentify changing procs to make it easy to avoid spam of gender change
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_ch.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_ch.dm
index 97d7385d7c..97354d7abb 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_ch.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_ch.dm
@@ -114,6 +114,8 @@ mob/living/carbon/proc/charmed() //TODO
//egglaying
+var/eggs = 0
+
/mob/living/proc/mobegglaying()
set name = "Egg laying"