diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm index 08ed1b68944..fb0db4ff31e 100644 --- a/code/datums/supplypacks/science_vr.dm +++ b/code/datums/supplypacks/science_vr.dm @@ -58,11 +58,9 @@ access = access_xenobiology contraband = 1 -/datum/supply_packs/sci/guardbeast - name = "V.A.R.M.A.corp autoNOMous security solution" - cost = 199 - containertype = /obj/structure/largecrate/animal/guardbeast - containername = "V.A.R.M.A.corp autoNOMous security solution crate" - access = list( - access_security, - access_xenobiology) \ No newline at end of file +/datum/supply_packs/sci/otie + name = "V.A.R.M.A.corp adoptable reject (Dangerous!)" + cost = 100 + containertype = /obj/structure/largecrate/animal/otie + containername = "V.A.R.M.A.corp adoptable reject (Dangerous!)" + access = access_xenobiology \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 0dc0698b23d..c22698ce458 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -53,8 +53,7 @@ /mob/living/simple_animal/hostile/bear;0.5, /mob/living/simple_animal/hostile/bear/brown;0.5, /mob/living/simple_animal/hostile/carp, - /mob/living/simple_animal/otie/friendly;0.5, - /mob/living/simple_animal/otie/friendly/cotie;0.5, + /mob/living/simple_animal/otie/friendly, /mob/living/simple_animal/hostile/mimic) ..() @@ -79,4 +78,19 @@ desc = "The V.A.R.M.A.corp bioengineering division flagship product on trained optimal snowflake guard dogs." icon = 'icons/obj/storage_vr.dmi' icon_state = "sotiecrate" - held_type = /mob/living/simple_animal/otie/friendly/security \ No newline at end of file + held_type = /mob/living/simple_animal/otie/friendly/security + +/obj/structure/largecrate/animal/otie + name = "V.A.R.M.A.corp 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!" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "otiecrate2" + held_type = /mob/living/simple_animal/otie/friendly/cotie + var/taped = 1 + +/obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao + if(taped == 1) + playsound(src, 'sound/items/poster_ripped.ogg', 50, 1) + icon_state = "otiecrate" + taped = 0 + ..() \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm index 297541f593f..42cf375dfcb 100644 --- a/code/modules/mob/living/simple_animal/vore/otie.dm +++ b/code/modules/mob/living/simple_animal/vore/otie.dm @@ -56,7 +56,7 @@ melee_damage_lower = 10 melee_damage_upper = 25 // Lazy way of making sure this otie survives outside. - min_oxy = 0.5 + min_oxy = 0 max_oxy = 0 min_tox = 0 max_tox = 0 diff --git a/icons/obj/storage_vr.dmi b/icons/obj/storage_vr.dmi index 161d35f236a..46e37980923 100644 Binary files a/icons/obj/storage_vr.dmi and b/icons/obj/storage_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index f204cebb431..eb783b071a1 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -267,6 +267,7 @@ #include "code\datums\supplypacks\science.dm" #include "code\datums\supplypacks\science_vr.dm" #include "code\datums\supplypacks\security.dm" +#include "code\datums\supplypacks\security_vr.dm" #include "code\datums\supplypacks\supply.dm" #include "code\datums\supplypacks\supplypacks.dm" #include "code\datums\supplypacks\voidsuits.dm"