From 21417259ea3826d3d324bee7d459a30cd2a9dec9 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 6 Sep 2022 16:30:44 +0300 Subject: [PATCH] Enables cargo otie crates Also adds a few more rng types for the said crates. Unmarked earlyport for now i guess --- code/datums/supplypacks/science_vr.dm | 3 +- code/datums/supplypacks/security_vr.dm | 3 +- .../crates_lockers/largecrate_vr.dm | 29 +++++++++++++++---- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm index 1d9922e7d8..2e9f756aa2 100644 --- a/code/datums/supplypacks/science_vr.dm +++ b/code/datums/supplypacks/science_vr.dm @@ -29,7 +29,7 @@ containertype = /obj/structure/largecrate/animal/weretiger containername = "Weretiger crate" access = access_xenobiology -/* + /datum/supply_pack/sci/otie name = "VARMAcorp adoptable reject (Dangerous!)" cost = 100 @@ -43,4 +43,3 @@ containertype = /obj/structure/largecrate/animal/otie/phoron containername = "VARMAcorp adaptive beta subject (Experimental)" access = access_xenobiology -*/ //VORESTATION AI TEMPORARY REMOVAL. Oties commented out cuz broke. diff --git a/code/datums/supplypacks/security_vr.dm b/code/datums/supplypacks/security_vr.dm index a00556e528..bbb28e08fb 100644 --- a/code/datums/supplypacks/security_vr.dm +++ b/code/datums/supplypacks/security_vr.dm @@ -1,4 +1,4 @@ -/*/datum/supply_pack/security/guardbeast //VORESTATION AI TEMPORARY REMOVAL +/datum/supply_pack/security/guardbeast name = "VARMAcorp autoNOMous security solution" cost = 150 containertype = /obj/structure/largecrate/animal/guardbeast @@ -17,7 +17,6 @@ access_security, access_xenobiology) one_access = TRUE -*/ /datum/supply_pack/randomised/security/armor access = access_armory diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index b70833ccea..3b35be2479 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -56,7 +56,7 @@ /mob/living/simple_mob/otie/zorgoia, //CHOMPstation edit /mob/living/simple_mob/vore/rabbit, /mob/living/simple_mob/vore/weretiger;0.5, -// /mob/living/simple_mob/otie;0.5 + /mob/living/simple_mob/otie;0.5 )) return ..() @@ -72,11 +72,12 @@ /mob/living/simple_mob/animal/space/alien/drone, /mob/living/simple_mob/animal/space/alien/sentinel, /mob/living/simple_mob/animal/space/alien/queen, -// /mob/living/simple_mob/otie/feral, -// /mob/living/simple_mob/otie/red, + /mob/living/simple_mob/otie/feral, + /mob/living/simple_mob/otie/feral/chubby, + /mob/living/simple_mob/otie/red, /mob/living/simple_mob/vore/aggressive/corrupthound)) return ..() -/* + /obj/structure/largecrate/animal/guardbeast name = "VARMAcorp autoNOMous security solution" desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs." @@ -84,6 +85,11 @@ icon_state = "sotiecrate" starts_with = list(/mob/living/simple_mob/otie/security) +/obj/structure/largecrate/animal/otie/guardbeast/Initialize() + starts_with = list(pick(/mob/living/simple_mob/otie/security, + /mob/living/simple_mob/otie/security/chubby)) + return ..() + /obj/structure/largecrate/animal/guardmutant name = "VARMAcorp autoNOMous security solution for hostile environments." desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. This one can survive hostile atmosphere." @@ -91,6 +97,12 @@ icon_state = "sotiecrate" starts_with = list(/mob/living/simple_mob/otie/security/phoron) +/obj/structure/largecrate/animal/otie/guardmutant/Initialize() + starts_with = list(pick(/mob/living/simple_mob/otie/security/phoron;2, + /mob/living/simple_mob/otie/security/phoron/red;0.5, + /mob/living/simple_mob/otie/security/phoron/red/chubby;0.5)) + return ..() + /obj/structure/largecrate/animal/otie name = "VARMAcorp adoptable reject (Dangerous!)" desc = "A warning on the side says the creature inside was returned to the supplier after injuring or devouring several unlucky members of the previous adoption family. It was given a second chance with the next customer. Godspeed and good luck with your new pet!" @@ -99,6 +111,11 @@ starts_with = list(/mob/living/simple_mob/otie/cotie) var/taped = 1 +/obj/structure/largecrate/animal/otie/Initialize() + starts_with = list(pick(/mob/living/simple_mob/otie/cotie, + /mob/living/simple_mob/otie/cotie/chubby)) + return ..() + /obj/structure/largecrate/animal/otie/phoron name = "VARMAcorp adaptive beta subject (Experimental)" desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!" @@ -106,7 +123,8 @@ /obj/structure/largecrate/animal/otie/phoron/Initialize() starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2, - /mob/living/simple_mob/otie/red/friendly;0.5)) + /mob/living/simple_mob/otie/red/friendly;0.5, + /mob/living/simple_mob/otie/red/chubby;0.5)) return ..() /obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao @@ -115,7 +133,6 @@ icon_state = "otiecrate" taped = 0 ..() -*/ //VORESTATION AI REMOVAL, Oties are still fucking broken. /obj/structure/largecrate/animal/catgirl name = "Catgirl Crate"