From 720b6df5e9d87a790a05a278a6b679357ef16f38 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Tue, 28 Jun 2016 10:19:20 -0400 Subject: [PATCH 1/7] Fixes #384 Fixes #384 --- code/game/objects/structures/crates_lockers/closets/egg_vr.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm index ddfe55bebd..c1d5c40e0e 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm @@ -58,7 +58,6 @@ /obj/structure/closet/secure_closet/egg/shark name = "akula egg" desc = "Its soft and slimy to the touch" - icon = 'icons/obj/closet.dmi' icon_closed = "egg_akula" icon_opened = "egg_akula_open" From 947d1f307339f4851b62d7f81391c46f8a21dba6 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Tue, 28 Jun 2016 10:20:00 -0400 Subject: [PATCH 2/7] Update egg_vr.dm --- code/game/objects/structures/crates_lockers/closets/egg_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm index c1d5c40e0e..9e54eea395 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm @@ -58,6 +58,7 @@ /obj/structure/closet/secure_closet/egg/shark name = "akula egg" desc = "Its soft and slimy to the touch" + icon_state = "egg_akula" icon_closed = "egg_akula" icon_opened = "egg_akula_open" From 90b609c291d6c4956bbc68951e8a4d71993f6838 Mon Sep 17 00:00:00 2001 From: killer653 Date: Wed, 29 Jun 2016 02:40:01 -0400 Subject: [PATCH 3/7] Fixes #386 --- .../mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 575fe09fe6..2930a3ad32 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -362,7 +362,7 @@ hearer << deathsound T << deathsound //Spill(T) //TODOPOLARIS - T.Del() + qdel(T) src.update_patient() //Handle the target being anything but a /mob/living/carbon/human @@ -392,7 +392,7 @@ //Anything not perserved, PDA, or ID else //Spill(T) //Needs the spill proc to be added - T.Del() + qdel(T) src.update_patient() src.hound.cell.charge += 10 return From 4fbec913527881740fee8881368f3dd84e7805b7 Mon Sep 17 00:00:00 2001 From: killer653 Date: Wed, 29 Jun 2016 02:53:09 -0400 Subject: [PATCH 4/7] Fixes absorption --- code/modules/vore/eating/bellymodes_vr.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 28a05c2b89..b62b8ccc7b 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -88,10 +88,10 @@ if(M.absorbed) continue - if(M.nutrition >= 4) //Drain them until there's no nutrients left. Slowly "absorb" them. - M.nutrition -= 3 - owner.nutrition += 3 - else if(M.nutrition < 4) //When they're finally drained. + if(M.nutrition >= 100) //Drain them until there's no nutrients left. Slowly "absorb" them. + M.nutrition = (M.nutrition * 0.9) + owner.nutrition += (M.nutrition * 0.1) + else if(M.nutrition < 100) //When they're finally drained. absorb_living(M) return From 64b42e625701a49c5c7926e68e476b25bb4ff882 Mon Sep 17 00:00:00 2001 From: killer653 Date: Wed, 29 Jun 2016 03:11:49 -0400 Subject: [PATCH 5/7] Forgot this --- code/modules/vore/eating/bellymodes_vr.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index b62b8ccc7b..81a4269532 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -89,8 +89,9 @@ continue if(M.nutrition >= 100) //Drain them until there's no nutrients left. Slowly "absorb" them. + var/oldnutrition = (M.nutrition * 0.1) M.nutrition = (M.nutrition * 0.9) - owner.nutrition += (M.nutrition * 0.1) + owner.nutrition += oldnutrition else if(M.nutrition < 100) //When they're finally drained. absorb_living(M) From 33f94bd9c168cef8f4eb14a875c672cabcbc63e3 Mon Sep 17 00:00:00 2001 From: killer653 Date: Wed, 29 Jun 2016 03:47:20 -0400 Subject: [PATCH 6/7] Makes absorb longer --- code/modules/vore/eating/bellymodes_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 81a4269532..fb8c32486d 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -89,8 +89,8 @@ continue if(M.nutrition >= 100) //Drain them until there's no nutrients left. Slowly "absorb" them. - var/oldnutrition = (M.nutrition * 0.1) - M.nutrition = (M.nutrition * 0.9) + var/oldnutrition = (M.nutrition * 0.05) + M.nutrition = (M.nutrition * 0.95) owner.nutrition += oldnutrition else if(M.nutrition < 100) //When they're finally drained. absorb_living(M) From 7575cfef9e4491345be06e5722d330d4bb74b793 Mon Sep 17 00:00:00 2001 From: killer653 Date: Thu, 30 Jun 2016 02:14:36 -0400 Subject: [PATCH 7/7] Adds the monkeys back --- .../carbon/human/species/station/monkey_vr.dm | 64 +++++++++++------- .../human_races/monkeys/r_sergaling_vr.dmi | Bin 0 -> 1163 bytes icons/mob/human_races/monkeys/r_sobaka_vr.dmi | Bin 0 -> 1477 bytes icons/mob/human_races/monkeys/r_sparra_vr.dmi | Bin 0 -> 1209 bytes vorestation.dme | 1 + 5 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 icons/mob/human_races/monkeys/r_sergaling_vr.dmi create mode 100644 icons/mob/human_races/monkeys/r_sobaka_vr.dmi create mode 100644 icons/mob/human_races/monkeys/r_sparra_vr.dmi diff --git a/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm b/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm index 39c283071b..bb62d48a58 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey_vr.dm @@ -1,23 +1,26 @@ /datum/species/monkey/shark - name = "Sobaka" - voice_name = "Sobaka" - speak_emote = list("squeaks") - icon_state = "sharkpup1" - greaterform = "Akula" + name = "Sobaka" + name_plural = "Sobaka" + icobase = 'icons/mob/human_races/monkeys/r_sobaka_vr.dmi' + deform = 'icons/mob/human_races/monkeys/r_sobaka_vr.dmi' + tail = null //The tail is part of its body due to tail using the "icons/effects/species.dmi" file. It must be null, or they'll have a chimp tail. + greater_form = "Akula" //Oh, also, I went ahead and made it so everything lines up so it looks nice. /datum/species/monkey/sergal - name = "Sergaling" - voice_name = "Sergaling" - speak_emote = list("growls") - icon_state = "sergal1" - greaterform = "Sergal" + name = "Sergaling" + greater_form = "Sergal" + icobase = 'icons/mob/human_races/monkeys/r_sergaling_vr.dmi' + deform = 'icons/mob/human_races/monkeys/r_sergaling_vr.dmi' + tail = null /datum/species/monkey/sparra - name = "Sparra" - voice_name = "Sparra" - speak_emote = list("chirps") - icon_state = "sparra1" - greaterform = "Nevrean" + name = "Sparra" + name_plural = "Sparra" + greater_form = "Nevrean" + tail = null + icobase = 'icons/mob/human_races/monkeys/r_sparra_vr.dmi' + deform = 'icons/mob/human_races/monkeys/r_sparra_vr.dmi' + /* Example from Polaris code /datum/species/monkey/tajaran @@ -35,14 +38,29 @@ */ /datum/species/monkey/vulpkanin - name = "Wolpin" - name_plural = "Wolpin" - speak_emote = list("rrfts") + name = "Wolpin" + name_plural = "Wolpin" - icobase = 'icons/mob/human_races/monkeys/r_wolpin.dmi' - deform = 'icons/mob/human_races/monkeys/r_wolpin.dmi' + icobase = 'icons/mob/human_races/monkeys/r_wolpin.dmi' + deform = 'icons/mob/human_races/monkeys/r_wolpin.dmi' - greater_form = "Vulpkanin" + greater_form = "Vulpkanin" default_language = "Canilunzt" - flesh_color = "#966464" - base_color = "#000000" \ No newline at end of file + flesh_color = "#966464" + base_color = "#000000" + tail = null + +//INSERT CODE HERE SO MONKEYS CAN BE SPAWNED. +//Also, M was added to the end of the spawn names to signify that it's a monkey, since some names were conflicting. + +/mob/living/carbon/human/sharkm/New(var/new_loc) + ..(new_loc, "Sobaka") + +/mob/living/carbon/human/sergallingm/New(var/new_loc) + ..(new_loc, "Sergaling") + +/mob/living/carbon/human/sparram/New(var/new_loc) + ..(new_loc, "Sparra") + +/mob/living/carbon/human/vulpkaninm/New(var/new_loc) + ..(new_loc, "Wolpin") \ No newline at end of file diff --git a/icons/mob/human_races/monkeys/r_sergaling_vr.dmi b/icons/mob/human_races/monkeys/r_sergaling_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a56d33162c693acf621f862e4416eb6121d558c7 GIT binary patch literal 1163 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 Xn=uvrEgw~E00000NkvXXu0mjf;NL?A literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 00407da92f..8ae0692d24 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1480,6 +1480,7 @@ #include "code\modules\mob\living\carbon\human\species\outsider\shadow.dm" #include "code\modules\mob\living\carbon\human\species\station\golem.dm" #include "code\modules\mob\living\carbon\human\species\station\monkey.dm" +#include "code\modules\mob\living\carbon\human\species\station\monkey_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\prometheans.dm" #include "code\modules\mob\living\carbon\human\species\station\prometheans_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\seromi.dm"