cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks and tidying

Browse Source
This commit is contained in:
Casey
2023-07-03 10:24:10 +00:00
committed by CHOMPStation2
parent b4547e8f25
commit 19550009ce
59 changed files with 9044 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/largecrate_vr.dm
+19 -5
View File
@@ -47,7 +47,7 @@
/mob/living/simple_mob/vore/horse,
/mob/living/simple_mob/vore/aggressive/panther,
/mob/living/simple_mob/vore/aggressive/giant_snake,
/mob/living/simple_mob/animal/wolf,
/mob/living/simple_mob/vore/wolf,
/mob/living/simple_mob/animal/space/bear;0.5,
/mob/living/simple_mob/animal/space/carp,
/mob/living/simple_mob/vore/aggressive/mimic,
@@ -56,7 +56,11 @@
/mob/living/simple_mob/otie/zorgoia, //CHOMPstation edit
/mob/living/simple_mob/vore/rabbit,
/mob/living/simple_mob/vore/weretiger;0.5,
<<<<<<< HEAD
/mob/living/simple_mob/otie;0.5
=======
// /mob/living/simple_mob/vore/otie;0.5
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks
))
return ..()
@@ -72,9 +76,14 @@
/mob/living/simple_mob/animal/space/alien/drone,
/mob/living/simple_mob/animal/space/alien/sentinel,
/mob/living/simple_mob/animal/space/alien/queen,
<<<<<<< HEAD
/mob/living/simple_mob/otie/feral,
/mob/living/simple_mob/otie/feral/chubby,
/mob/living/simple_mob/otie/red,
=======
// /mob/living/simple_mob/vore/otie/feral,
// /mob/living/simple_mob/vore/otie/red,
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks
/mob/living/simple_mob/vore/aggressive/corrupthound))
return ..()
@@ -83,7 +92,7 @@
desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs."
icon = 'icons/obj/storage_vr.dmi'
icon_state = "sotiecrate"
starts_with = list(/mob/living/simple_mob/otie/security)
starts_with = list(/mob/living/simple_mob/vore/otie/security)
/obj/structure/largecrate/animal/otie/guardbeast/Initialize()
starts_with = list(pick(/mob/living/simple_mob/otie/security,
@@ -95,7 +104,7 @@
desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. This one can survive hostile atmosphere."
icon = 'icons/obj/storage_vr.dmi'
icon_state = "sotiecrate"
starts_with = list(/mob/living/simple_mob/otie/security/phoron)
starts_with = list(/mob/living/simple_mob/vore/otie/security/phoron)
/obj/structure/largecrate/animal/otie/guardmutant/Initialize()
starts_with = list(pick(/mob/living/simple_mob/otie/security/phoron;2,
@@ -108,7 +117,7 @@
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"
starts_with = list(/mob/living/simple_mob/otie/cotie)
starts_with = list(/mob/living/simple_mob/vore/otie/cotie)
var/taped = 1
/obj/structure/largecrate/animal/otie/Initialize()
@@ -119,12 +128,17 @@
/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!"
starts_with = list(/mob/living/simple_mob/otie/cotie/phoron)
starts_with = list(/mob/living/simple_mob/vore/otie/cotie/phoron)
/obj/structure/largecrate/animal/otie/phoron/Initialize()
<<<<<<< HEAD
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/chubby;0.5))
=======
starts_with = list(pick(/mob/living/simple_mob/vore/otie/cotie/phoron;2,
/mob/living/simple_mob/vore/otie/red/friendly;0.5))
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks
return ..()
/obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao
code/game/objects/structures/ghost_pods/event_vr.dm
+15
View File
@@ -29,11 +29,16 @@
"Lizardman" = /mob/living/simple_mob/vore/aggressive/lizardman,//CHOMPedit: more mobs
"Giant Frog" = /mob/living/simple_mob/vore/aggressive/frog,
"Giant Rat" = /mob/living/simple_mob/vore/aggressive/rat,
<<<<<<< HEAD
"Jelly Blob" = /mob/living/simple_mob/animal/space/jelly,
"Wolf" = /mob/living/simple_mob/animal/wolf,
"Dire Wolf" = /mob/living/simple_mob/animal/wolf/direwolf,//CHOMPedit: more mobs
"Large Dog" = /mob/living/simple_mob/animal/wolf/direwolf/dog,//CHOMPedit: more mobs
"Hyena" = /mob/living/simple_mob/animal/hyena,//CHOMPedit: more mobs
=======
"Jelly Blob" = /mob/living/simple_mob/vore/jelly,
"Wolf" = /mob/living/simple_mob/vore/wolf,
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks
"Juvenile Solargrub" = /mob/living/simple_mob/vore/solargrub,
"Sect Queen" = /mob/living/simple_mob/vore/sect_queen,
"Sect Drone" = /mob/living/simple_mob/vore/sect_drone,
@@ -41,6 +46,7 @@
"Panther" = /mob/living/simple_mob/vore/aggressive/panther,
"Giant Snake" = /mob/living/simple_mob/vore/aggressive/giant_snake,
"Deathclaw" = /mob/living/simple_mob/vore/aggressive/deathclaw,
<<<<<<< HEAD
"Otie" = /mob/living/simple_mob/otie,
"Chubby Otie" = /mob/living/simple_mob/otie/friendly/chubby,//CHOMPedit: more mobs
"Mutated Otie" = /mob/living/simple_mob/otie/feral,
@@ -48,6 +54,11 @@
"Red Otie" = /mob/living/simple_mob/otie/red,
"Chubby Red Otie" = /mob/living/simple_mob/otie/red/chubby,//CHOMPedit: more mobs
"Zorgoia" = /mob/living/simple_mob/otie/zorgoia,//CHOMPedit: more mobs
=======
"Otie" = /mob/living/simple_mob/vore/otie,
"Mutated Otie" =/mob/living/simple_mob/vore/otie/feral,
"Red Otie" = /mob/living/simple_mob/vore/otie/red,
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks
"Corrupt Hound" = /mob/living/simple_mob/vore/aggressive/corrupthound,
"Corrupt Corrupt Hound" = /mob/living/simple_mob/vore/aggressive/corrupthound/prettyboi,
"Hunter Giant Spider" = /mob/living/simple_mob/animal/giant_spider/hunter,
@@ -125,9 +136,13 @@
/obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(var/mob/M)
..()
<<<<<<< HEAD
var/mob/living/simple_mob/vore/hostile/morph/newMorph = new /mob/living/simple_mob/vore/hostile/morph(get_turf(src))
newMorph.voremob_loaded = TRUE //CHOMPedit: On-demand belly loading.
newMorph.init_vore() //CHOMPedit: On-demand belly loading.
=======
var/mob/living/simple_mob/vore/morph/newMorph = new /mob/living/simple_mob/vore/morph(get_turf(src))
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks
if(M.mind)
M.mind.transfer_to(newMorph)
to_chat(M, "<span class='notice'>You are a <b>Morph</b>, somehow having gotten aboard the station in your wandering. \