cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

big resync + merge conflicts

Browse Source
This commit is contained in:
Raeschen
2023-07-05 10:12:39 +02:00
parent 19550009ce
commit 3e0a0c0c98
8 changed files with 1861 additions and 4612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/game/objects/structures/crates_lockers/largecrate_vr.dm
View File

@@ -56,11 +56,7 @@
/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 ..()
@@ -76,11 +72,6 @@
/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
@@ -131,14 +122,8 @@
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

27
code/game/objects/structures/ghost_pods/event_vr.dm
View File

@@ -29,16 +29,11 @@
"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,
"Jelly Blob" = /mob/living/simple_mob/vore/jelly,
"Wolf" = /mob/living/simple_mob/vore/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,
@@ -46,19 +41,13 @@
"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,
"Otie" = /mob/living/simple_mob/vore/otie,
"Chubby Otie" = /mob/living/simple_mob/otie/friendly/chubby,//CHOMPedit: more mobs
"Mutated Otie" = /mob/living/simple_mob/otie/feral,
"Mutated Otie" =/mob/living/simple_mob/vore/otie/feral,
"Chubby Mutated Otie" = /mob/living/simple_mob/otie/feral/chubby,//CHOMPedit: more mobs
"Red Otie" = /mob/living/simple_mob/otie/red,
"Red Otie" = /mob/living/simple_mob/vore/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,
@@ -136,13 +125,9 @@
/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))
var/mob/living/simple_mob/vore/morph/newMorph = new /mob/living/simple_mob/vore/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. \

6
maps/expedition_vr/aerostat/_aerostat.dm
View File

@@ -139,17 +139,11 @@
prob_fall = 30
//guard = 20
mobs_to_pick_from = list(
<<<<<<< HEAD
/mob/living/simple_mob/animal/space/jelly = 1,
/mob/living/simple_mob/mechanical/viscerator = 1,
/mob/living/simple_mob/vore/aggressive/corrupthound = 1
=======
/mob/living/simple_mob/vore/jelly = 6,
/mob/living/simple_mob/mechanical/viscerator = 6,
/mob/living/simple_mob/vore/aggressive/corrupthound = 3,
/mob/living/simple_mob/vore/oregrub = 2,
/mob/living/simple_mob/vore/oregrub/lava = 1
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks
)
/obj/structure/old_roboprinter

1855
maps/submaps/surface_submaps/plains/dogbase.dmm Normal file
View File

File diff suppressed because it is too large Load Diff

1891
maps/submaps/surface_submaps/wilderness/dogbase.dmm
View File

File diff suppressed because it is too large Load Diff

49
maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
View File

@@ -5,12 +5,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
"aB" = (
/obj/structure/safe,
/obj/effect/floor_decal/borderfloor{
dir = 5
=======
"ae" = (
/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{
desc = "The biggest and baddest guard dog around.";
@@ -18,7 +12,6 @@
max_co2 = 0;
max_tox = 0;
name = "syndicate guard dog"
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm
},
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
@@ -96,14 +89,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
"ec" = (
/mob/living/simple_mob/animal/giant_spider/nurse{
=======
"eZ" = (
/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{
desc = "The biggest and baddest guard dog around.";
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm
faction = "syndicate";
name = "trained giant spider"
},
@@ -260,10 +248,6 @@
/obj/item/weapon/bedsheet,
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
"md" = (
/obj/machinery/door/airlock,
=======
"qZ" = (
/obj/effect/decal/remains/ribcage,
/turf/template_noop,
@@ -276,7 +260,6 @@
max_tox = 0;
name = "syndicate guard dog"
},
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
"mF" = (
@@ -338,11 +321,6 @@
/obj/effect/landmark/loot_spawn,
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
"pT" = (
/obj/machinery/light{
dir = 1
=======
"wS" = (
/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{
desc = "The biggest and baddest guard dog around.";
@@ -363,7 +341,6 @@
d1 = 1;
d2 = 2;
icon_state = "1-2"
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm
},
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -482,11 +459,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
"yr" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
=======
"Dv" = (
/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{
desc = "The biggest and baddest guard dog around.";
@@ -494,7 +466,6 @@
max_co2 = 0;
max_tox = 0;
name = "syndicate guard dog"
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm
},
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
@@ -639,11 +610,6 @@
/obj/random/projectile/scrapped_pistol,
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
"Io" = (
/obj/machinery/light,
/obj/effect/floor_decal/borderfloor,
=======
"Ol" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -672,7 +638,6 @@
/area/submap/DogBase)
"OS" = (
/obj/effect/floor_decal/corner/red/border,
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
"Ju" = (
@@ -707,9 +672,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/submap/DogBase)
<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
"KH" = (
=======
"QB" = (
/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{
desc = "The biggest and baddest guard dog around.";
@@ -723,7 +685,6 @@
/turf/simulated/floor/outdoors/dirt/virgo3b,
/area/template_noop)
"Rz" = (
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm
/obj/structure/table/woodentable,
/obj/random/contraband/nofail,
/turf/simulated/floor/tiled/dark,
@@ -820,15 +781,6 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
/turf/simulated/floor/outdoors/dirt/sif/planetuse,
/area/submap/DogBase)
"QF" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1";
pixel_x = 0
=======
/turf/simulated/floor/outdoors/dirt/virgo3b,
/area/template_noop)
"Ya" = (
@@ -838,7 +790,6 @@
max_co2 = 0;
max_tox = 0;
name = "syndicate guard dog"
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm
},
/obj/effect/floor_decal/borderfloor{
dir = 4

1558
maps/submaps/surface_submaps/wilderness/greatwolfden.dmm
View File

File diff suppressed because it is too large Load Diff

1072
maps/submaps/surface_submaps/wilderness/otieshelter.dmm
View File

File diff suppressed because it is too large Load Diff