diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm index ee73bf1089..c3ec833438 100644 --- a/code/datums/supplypacks/science_vr.dm +++ b/code/datums/supplypacks/science_vr.dm @@ -60,11 +60,9 @@ access = access_xenobiology contraband = 1 -/* Removed until Otie code is unfucked. /datum/supply_packs/sci/otie - name = "V.A.R.M.A.corp adoptable reject (Dangerous!)" + name = "VARMAcorp adoptable reject (Dangerous!)" cost = 100 containertype = /obj/structure/largecrate/animal/otie - containername = "V.A.R.M.A.corp adoptable reject (Dangerous!)" + containername = "VARMAcorp adoptable reject (Dangerous!)" access = access_xenobiology -*/ diff --git a/code/datums/supplypacks/security_vr.dm b/code/datums/supplypacks/security_vr.dm index a432b112fa..3c656741ee 100644 --- a/code/datums/supplypacks/security_vr.dm +++ b/code/datums/supplypacks/security_vr.dm @@ -1,13 +1,11 @@ -/* Removed until Otie code is unfucked. /datum/supply_packs/security/guardbeast - name = "V.A.R.M.A.corp autoNOMous security solution" + name = "VARMAcorp autoNOMous security solution" cost = 150 containertype = /obj/structure/largecrate/animal/guardbeast - containername = "V.A.R.M.A.corp autoNOMous security solution crate" + containername = "VARMAcorp autoNOMous security solution crate" access = list( access_security, access_xenobiology) -*/ /datum/supply_packs/security/biosuit contains = list( diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 964022061a..b64fdab337 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -69,19 +69,19 @@ /mob/living/simple_animal/hostile/alien, /mob/living/simple_animal/hostile/alien/drone, /mob/living/simple_animal/hostile/alien/sentinel, - /mob/living/simple_animal/hostile/alien/queen) + /mob/living/simple_animal/hostile/alien/queen, + /mob/living/simple_animal/otie/feral) ..() -/* // Removed until Otie code is unfucked. /obj/structure/largecrate/animal/guardbeast - name = "V.A.R.M.A.corp autoNOMous security solution" - desc = "The V.A.R.M.A.corp bioengineering division flagship product on trained optimal snowflake guard dogs." + name = "VARMAcorp autoNOMous security solution" + desc = "The VARMAcorp 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 /obj/structure/largecrate/animal/otie - name = "V.A.R.M.A.corp adoptable reject (Dangerous!)" + 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!" icon = 'icons/obj/storage_vr.dmi' icon_state = "otiecrate2" @@ -93,5 +93,4 @@ playsound(src, 'sound/items/poster_ripped.ogg', 50, 1) icon_state = "otiecrate" taped = 0 - ..() -*/ \ No newline at end of file + ..() \ 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 d9083acd57..959b7bc1ca 100644 --- a/code/modules/mob/living/simple_animal/vore/otie.dm +++ b/code/modules/mob/living/simple_animal/vore/otie.dm @@ -1,4 +1,7 @@ // ToDo: Make this code not a fucking snowflaky horrible broken mess. Do not use until it's actually fixed. It's miserably bad right now. +// Also ToDo: Dev-to-dev communication to ensure responsible parties (if available. In this case, yes.) are aware of what's going on and what's broken. +// Probably easier to troubleshoot when we ain't breaking the server by spawning a buttload of heavily extra feature coded snowflake mobs to the wilderness as mass cannonfodder. +// Also ToDo: An actual "simple" mob for that purpose if necessary :v /mob/living/simple_animal/otie //Spawn this one only if you're looking for a bad time. Not friendly. name = "otie" @@ -15,7 +18,6 @@ minbodytemp = 200 move_to_delay = 4 hostile = 1 - //cooperative = 1 // Neutral mobs should not be set like this. investigates = 1 reacts = 1 retaliate = 1 @@ -28,8 +30,7 @@ emote_hear = list("rurrs", "rumbles", "rowls", "groans softly", "murrs", "sounds hungry", "yawns") emote_see = list("stares ferociously", "snarls", "licks their chops", "stretches", "yawns") say_maybe_target = list("Ruh?", "Waf?") - say_got_target = list("Rurrr!", "ROAR!", "MARR!", "RAHH!", "Slurp.. RAH!") - say_got_target = list("Rurrr!", "ROAR!", "RERR!", "NOM!", "MINE!", "RAHH!", "RAH!", "WARF!") + say_got_target = list("Rurrr!", "ROAR!", "MARR!", "RERR!", "NOM!", "RAHH!", "RAH!", "WARF!") melee_damage_lower = 5 melee_damage_upper = 15 //Don't break my bones bro response_help = "pets the" @@ -56,7 +57,7 @@ vore_icons = SA_ICON_LIVING /mob/living/simple_animal/otie/feral //gets the pet2tame feature. starts out hostile tho so get gamblin' - name = "feral otie" + name = "mutated feral otie" desc = "The classic bioengineered longdog. No pets. Only bite. This one has mutated from too much time out on the surface of Virgo-3B." icon_state = "siftusian" icon_living = "siftusian" @@ -91,7 +92,7 @@ /mob/living/simple_animal/otie/friendly/security //tame by default unless you're a marked crimester. can be befriended to follow with pets tho. name = "guard otie" - desc = "The V.A.R.M.A.corp bioengineering division flagship product on trained optimal snowflake guard dogs." + desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs." icon_state = "sotie" icon_living = "sotie" icon_rest = "sotie_rest" diff --git a/vorestation.dme b/vorestation.dme index 486d0aa726..b7d7274f32 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2001,6 +2001,7 @@ #include "code\modules\mob\living\simple_animal\vore\frog.dm" #include "code\modules\mob\living\simple_animal\vore\gaslamp.dm" #include "code\modules\mob\living\simple_animal\vore\horse.dm" +#include "code\modules\mob\living\simple_animal\vore\otie.dm" #include "code\modules\mob\living\simple_animal\vore\panther.dm" #include "code\modules\mob\living\simple_animal\vore\snake.dm" #include "code\modules\mob\living\simple_animal\vore\solargrub.dm"