From b6a288fcf4d9d72fb479ee68810f87839c779ac5 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 28 Aug 2017 21:33:42 +0200 Subject: [PATCH 1/9] Adds 4 new crates for 4 new monkey cubes Basically the same as the pull I did a moment ago. --- code/datums/supplypacks/hydroponics_vr.dm | 30 ++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/code/datums/supplypacks/hydroponics_vr.dm b/code/datums/supplypacks/hydroponics_vr.dm index 08b721dba90..e5c5cd39272 100644 --- a/code/datums/supplypacks/hydroponics_vr.dm +++ b/code/datums/supplypacks/hydroponics_vr.dm @@ -3,4 +3,32 @@ cost = 200 //You're getting 22 birds. Of course it's going to be a lot! containertype = /obj/structure/largecrate/birds containername = "Bird crate" - access = access_hydroponics \ No newline at end of file + access = access_hydroponics + + /datum/supply_packs/hydro/sobaka + name = "Sobaka crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Sobaka crate" + + /datum/supply_packs/hydro/saru + name = "Saru crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/sarucubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Saru crate" + + /datum/supply_packs/hydro/sparra + name = "Sparra crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/sparracubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Sparra crate" + + /datum/supply_packs/hydro/wolpin + name = "Wolpin crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Wolpin crate" From 035ce3a7a629cf86ffc713e89f250a8987b9d119 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 28 Aug 2017 21:37:21 +0200 Subject: [PATCH 2/9] adds primal boxes yada yada adds those 4 monkeys in boxes --- .../vore/fluffstuff/custom_boxes_vr.dm | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index c3c99fedd8b..ce34be66958 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -242,3 +242,40 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit. /obj/item/weapon/storage/box/fluff/swimsuit/medical name = "Medical Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/fluff/medical) + +//Monkey boxes for the new primals we have +/obj/item/weapon/storage/box/monkeycubes/sobakacubes + name = "sobaka cube box" + desc = "Drymate brand sobaka cubes. Just add water!" + +/obj/item/weapon/storage/box/monkeycubes/sobakacubes/New() + ..() + for(var/i = 1 to 4) + new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube(src) + +/obj/item/weapon/storage/box/monkeycubes/sarucubes + name = "saru cube box" + desc = "Drymate brand saru cubes. Just add water!" + +/obj/item/weapon/storage/box/monkeycubes/sarucubes/New() + ..() + for(var/i = 1 to 4) + new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube(src) + +/obj/item/weapon/storage/box/monkeycubes/sparracubes + name = "sparra cube box" + desc = "Drymate brand sparra cubes. Just add water!" + +/obj/item/weapon/storage/box/monkeycubes/sparracubes/New() + ..() + for(var/i = 1 to 4) + new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube(src) + +/obj/item/weapon/storage/box/monkeycubes/wolpincubes + name = "wolpin cube box" + desc = "Drymate brand wolpin cubes. Just add water!" + +/obj/item/weapon/storage/box/monkeycubes/wolpincubes/New() + ..() + for(var/i = 1 to 4) + new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube(src) From 8c0b06fc39874eb78da5f4eb4efb296b3ce34bbe Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 28 Aug 2017 21:38:55 +0200 Subject: [PATCH 3/9] Adds the cubes themselves for the monkeys as the titles says --- .../reagent_containers/food/snacks_vr.dm | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm index f95331c86ba..b1706d33049 100644 --- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm +++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm @@ -189,3 +189,35 @@ ..() reagents.add_reagent("protein", 4) bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube + name = "sobaka cube" + monkey_type = "Sobaka" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube + name = "sobaka cube" + monkey_type = "Sobaka" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube + name = "saru cube" + monkey_type = "Saru" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube + name = "saru cube" + monkey_type = "Saru" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sparracube + name = "sparra cube" + monkey_type = "Sparra" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube + name = "sparra cube" + monkey_type = "Sparra" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube + name = "wolpin cube" + monkey_type = "Wolpin" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube + name = "wolpin cube" + monkey_type = "Wolpin" From f03b7a3e38ee7dfa9c113be1d650e188a53f52b1 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 28 Aug 2017 22:17:56 +0200 Subject: [PATCH 4/9] Fixes snack_vr dm for primal additions --- .../reagent_containers/food/snacks_vr.dm | 66 ++++++++++++++++--- 1 file changed, 58 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm index b1706d33049..6d6e0c7ab67 100644 --- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm +++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm @@ -189,35 +189,85 @@ ..() reagents.add_reagent("protein", 4) bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/fenexcube + name = "fenex cube" + desc = "Just add water!" + flags = OPENCONTAINER + icon_state = "monkeycube" + bitesize = 12 + filling_color = "#ADAC7F" + center_of_mass = list("x"=16, "y"=14) -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube + var/wrapped = 0 + var/monkey_type = "Monkey" + +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/New() + ..() + reagents.add_reagent("protein", 10) + +/obj/item/weapon/reagent_containers/food/snacks/fenexycube/attack_self(mob/user as mob) + if(wrapped) + Unwrap(user) + +/obj/item/weapon/reagent_containers/food/snacks/fenexycube/proc/Expand() + src.visible_message("\The [src] expands!") + var/mob/living/carbon/human/H = new(get_turf(src)) + H.set_species(monkey_type) + H.real_name = H.species.get_random_name() + H.name = H.real_name + if(ismob(loc)) + var/mob/M = loc + M.unEquip(src) + qdel(src) + return 1 + +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/proc/Unwrap(mob/user as mob) + icon_state = "monkeycube" + desc = "Just add water!" + user << "You unwrap the cube." + wrapped = 0 + flags |= OPENCONTAINER + return + +/obj/item/weapon/reagent_containers/food/snacks/fenexycube/on_reagent_change() + if(reagents.has_reagent("water")) + Expand() + +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped + desc = "Still wrapped in some paper." + icon_state = "monkeycubewrap" + flags = 0 + wrapped = 1 + +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/sobakacube name = "sobaka cube" monkey_type = "Sobaka" -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped/sobakacube name = "sobaka cube" monkey_type = "Sobaka" -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/sarucube name = "saru cube" monkey_type = "Saru" -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped/sarucube name = "saru cube" monkey_type = "Saru" -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sparracube +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/sparracube name = "sparra cube" monkey_type = "Sparra" -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped/sparracube name = "sparra cube" monkey_type = "Sparra" -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wolpincube name = "wolpin cube" monkey_type = "Wolpin" -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube +/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped/wolpincube name = "wolpin cube" monkey_type = "Wolpin" From bcccf8e6f81fb4b1b49fa2a4247ac8419bc342c6 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 28 Aug 2017 22:34:36 +0200 Subject: [PATCH 5/9] attempts fixing primal cubes again --- .../reagent_containers/food/snacks_vr.dm | 66 +++---------------- 1 file changed, 8 insertions(+), 58 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm index 6d6e0c7ab67..b1706d33049 100644 --- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm +++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm @@ -189,85 +189,35 @@ ..() reagents.add_reagent("protein", 4) bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/fenexcube - name = "fenex cube" - desc = "Just add water!" - flags = OPENCONTAINER - icon_state = "monkeycube" - bitesize = 12 - filling_color = "#ADAC7F" - center_of_mass = list("x"=16, "y"=14) - var/wrapped = 0 - var/monkey_type = "Monkey" - -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/New() - ..() - reagents.add_reagent("protein", 10) - -/obj/item/weapon/reagent_containers/food/snacks/fenexycube/attack_self(mob/user as mob) - if(wrapped) - Unwrap(user) - -/obj/item/weapon/reagent_containers/food/snacks/fenexycube/proc/Expand() - src.visible_message("\The [src] expands!") - var/mob/living/carbon/human/H = new(get_turf(src)) - H.set_species(monkey_type) - H.real_name = H.species.get_random_name() - H.name = H.real_name - if(ismob(loc)) - var/mob/M = loc - M.unEquip(src) - qdel(src) - return 1 - -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/proc/Unwrap(mob/user as mob) - icon_state = "monkeycube" - desc = "Just add water!" - user << "You unwrap the cube." - wrapped = 0 - flags |= OPENCONTAINER - return - -/obj/item/weapon/reagent_containers/food/snacks/fenexycube/on_reagent_change() - if(reagents.has_reagent("water")) - Expand() - -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped - desc = "Still wrapped in some paper." - icon_state = "monkeycubewrap" - flags = 0 - wrapped = 1 - -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/sobakacube +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube name = "sobaka cube" monkey_type = "Sobaka" -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped/sobakacube +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube name = "sobaka cube" monkey_type = "Sobaka" -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/sarucube +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube name = "saru cube" monkey_type = "Saru" -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped/sarucube +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube name = "saru cube" monkey_type = "Saru" -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/sparracube +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sparracube name = "sparra cube" monkey_type = "Sparra" -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped/sparracube +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube name = "sparra cube" monkey_type = "Sparra" -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wolpincube +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube name = "wolpin cube" monkey_type = "Wolpin" -/obj/item/weapon/reagent_containers/food/snacks/fenexcube/wrapped/wolpincube +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube name = "wolpin cube" monkey_type = "Wolpin" From 15d978ba1ce041923ad4268eb56eee3087d05b2f Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 28 Aug 2017 22:39:32 +0200 Subject: [PATCH 6/9] indentation is evil Beware of copy-pasting code fuck --- .../reagents/reagent_containers/food/snacks_vr.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm index b1706d33049..721b9742c91 100644 --- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm +++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm @@ -193,31 +193,31 @@ /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube name = "sobaka cube" monkey_type = "Sobaka" - + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube name = "sobaka cube" monkey_type = "Sobaka" - + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube name = "saru cube" monkey_type = "Saru" - + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube name = "saru cube" monkey_type = "Saru" - + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sparracube name = "sparra cube" monkey_type = "Sparra" - + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube name = "sparra cube" monkey_type = "Sparra" - + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube name = "wolpin cube" monkey_type = "Wolpin" - + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube name = "wolpin cube" monkey_type = "Wolpin" From a627e5053e637f2ac785152b5d179389c7192411 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 28 Aug 2017 22:41:01 +0200 Subject: [PATCH 7/9] fixes indentation Lessons learnt, frijnnghh --- code/modules/vore/fluffstuff/custom_boxes_vr.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index ce34be66958..6d55cc5bf4d 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -242,39 +242,39 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit. /obj/item/weapon/storage/box/fluff/swimsuit/medical name = "Medical Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/fluff/medical) - + //Monkey boxes for the new primals we have /obj/item/weapon/storage/box/monkeycubes/sobakacubes name = "sobaka cube box" desc = "Drymate brand sobaka cubes. Just add water!" - + /obj/item/weapon/storage/box/monkeycubes/sobakacubes/New() ..() for(var/i = 1 to 4) new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube(src) - + /obj/item/weapon/storage/box/monkeycubes/sarucubes name = "saru cube box" desc = "Drymate brand saru cubes. Just add water!" - + /obj/item/weapon/storage/box/monkeycubes/sarucubes/New() ..() for(var/i = 1 to 4) new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube(src) - + /obj/item/weapon/storage/box/monkeycubes/sparracubes name = "sparra cube box" desc = "Drymate brand sparra cubes. Just add water!" - + /obj/item/weapon/storage/box/monkeycubes/sparracubes/New() ..() for(var/i = 1 to 4) new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube(src) - + /obj/item/weapon/storage/box/monkeycubes/wolpincubes name = "wolpin cube box" desc = "Drymate brand wolpin cubes. Just add water!" - + /obj/item/weapon/storage/box/monkeycubes/wolpincubes/New() ..() for(var/i = 1 to 4) From c2dd08a0c81b8c8488fd8f945e73624efbf9c8f8 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 28 Aug 2017 22:41:34 +0200 Subject: [PATCH 8/9] Welcome to the mess that's my copy and paste --- code/datums/supplypacks/hydroponics_vr.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/supplypacks/hydroponics_vr.dm b/code/datums/supplypacks/hydroponics_vr.dm index e5c5cd39272..2aff2873887 100644 --- a/code/datums/supplypacks/hydroponics_vr.dm +++ b/code/datums/supplypacks/hydroponics_vr.dm @@ -4,28 +4,28 @@ containertype = /obj/structure/largecrate/birds containername = "Bird crate" access = access_hydroponics - + /datum/supply_packs/hydro/sobaka name = "Sobaka crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Sobaka crate" - + /datum/supply_packs/hydro/saru name = "Saru crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/sarucubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Saru crate" - + /datum/supply_packs/hydro/sparra name = "Sparra crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/sparracubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Sparra crate" - + /datum/supply_packs/hydro/wolpin name = "Wolpin crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes) From 7055489f58636618546cd9d934b2ee7fa45d3012 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 28 Aug 2017 22:56:57 +0200 Subject: [PATCH 9/9] Fixes more indentation errors T_T --- code/datums/supplypacks/hydroponics_vr.dm | 54 +++++++++++------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/code/datums/supplypacks/hydroponics_vr.dm b/code/datums/supplypacks/hydroponics_vr.dm index 2aff2873887..25daad249c0 100644 --- a/code/datums/supplypacks/hydroponics_vr.dm +++ b/code/datums/supplypacks/hydroponics_vr.dm @@ -5,30 +5,30 @@ containername = "Bird crate" access = access_hydroponics - /datum/supply_packs/hydro/sobaka - name = "Sobaka crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes) - cost = 20 - containertype = /obj/structure/closet/crate/freezer - containername = "Sobaka crate" - - /datum/supply_packs/hydro/saru - name = "Saru crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/sarucubes) - cost = 20 - containertype = /obj/structure/closet/crate/freezer - containername = "Saru crate" - - /datum/supply_packs/hydro/sparra - name = "Sparra crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/sparracubes) - cost = 20 - containertype = /obj/structure/closet/crate/freezer - containername = "Sparra crate" - - /datum/supply_packs/hydro/wolpin - name = "Wolpin crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes) - cost = 20 - containertype = /obj/structure/closet/crate/freezer - containername = "Wolpin crate" +/datum/supply_packs/hydro/sobaka + name = "Sobaka crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Sobaka crate" + +/datum/supply_packs/hydro/saru + name = "Saru crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/sarucubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Saru crate" + +/datum/supply_packs/hydro/sparra + name = "Sparra crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/sparracubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Sparra crate" + +/datum/supply_packs/hydro/wolpin + name = "Wolpin crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Wolpin crate"