Skip to content

Commit

Permalink
[DRAFT] Slime Rancher? In my space station???? (Monkestation#1442)
Browse files Browse the repository at this point in the history
* start

* more stuff

* more changes

* more slime stuff

* Update slime.dm

* Update slime.dm

* adds more slime stuff

* start of crossbreeds

* adds the mutation types to all slimes temp for now

* guh

* more stuff

* makes slimes respect eachother eating stuff so they will target other things

* Update feed.dm

* sponge bob me boy why are the slimes stacking

* more slime stuff

* Update _base_slime.dm

* another trait

* start of slime corrals

* slime corrals

* more slime pen stuff

* adds all the crossbreed recipes.

* base slime colors done

* more traits, more fixes, better ui

* minor fixes

* test fixer

* holy shit is this a edmund macmillan reference?

* it fucking auto corrected mcmillen to mcmillan >:(

* overlay fix

* Merge branch 'slimerancher' of https://github.com/dwasint/monkestation2.0 into slimerancher

* Update tgstation.dme

* hard delete fixes

* makes shop work

* changes to mapping id

* metastation mapping changes

* adds the request console

* delta, ice and some meta changes

* fixes

* tram IG

* adds buyable corral pen upgrades

* map fix,  slime pen corral buying and upgrade viewing

* sanity checks the liquid groups because splits have a period of time where they can trigger other things which breaks liquids

* adds placeholder apply_water proc until we rework reagents.

* the research

* fuck

* whoops

* fixes

* Update mob_stacker.dm

* Update xenobiology.dm

* tons of fixes

* range increase, removal on death, mutation chance

* more changes

* guh

* Update vacuum_pack.dm

* Update vacuum_pack.dm

* Update ooze_compressor.dm

* Update slime_extracts.dm

* potential fixes

* more fixes

* wasn't getting latch bug anymore

* no split no ooze, traits pass down, random color mutation syringe

* fixes

* Update tramstation.dmm

* Update feed.dm

* repaths extracts, phasing fix, crossbreed cost increase, phasing issue fix

* Update ooze_compressor.dm

* Update slime_extracts.dm

* fixes compressor not being in the plumber, fixes crossbreeds being unmakable

* fixes slime mutations not working all the time, makes corrals load slimes at roundstart

* soda slime

* jps pathing

* adds ooze counter to the pen controller

* forgot to tick beer slimes

* Update ooze_compressor.dm

* Update cargo_driver.dm

* Update rat_organs.dm

* Update rat_organs.dm

* Update liquid_groups.dm

* prevents slime_stacks from feeding as it breaks mob buckling, adds the legendary rainbow slime

* Update _base_mutation.dm

* fixes

* fixes

* Update colors.dm

* makes them unbuckle in death

* should fix crossbreeds not properly respecting full reagents

* Update traitor.dm

* Update changeling.dm

* Update corral_corner.dm

* Update colors.dm

* changes shit

* fixes

* Update liquid_controller.dm

* Update liquid_turf.dm

* Update liquid_turf.dm

* maybe fixes it?

* Update _base_slime.dm

* guh

* start of emotional speech

* Update _base_slime.dm

* friendship tracker

* slime friendship throw, also fix for ooze compressor

* adds vac_tagging to gain friendship from feedings

* pet commands

* fixes runtime

* Update emotion_buffer.dm

* old slimes have died woah

* Update _base_slime.dm

* box xenobiology

* Update BoxStation.dmm

* snaps xeno shit from kilo

* map fixes

* Update nonhuman_corpses.dm

* more mapping fixes

* Update hilbertresearchfacility.dmm

* bam

* Update tgstation.dme

* whoops

* fixes

* Update mutation_syringe.dm

* fixes

* fixes

* Update BoxStation.dmm

* Revert "Update BoxStation.dmm"

This reverts commit ac5e684.

* Revert "Merge branch 'master' into slimerancher"

This reverts commit de0a367, reversing
changes made to c903670.

* Reapply "Merge branch 'master' into slimerancher"

This reverts commit 8a32f48.

* Reapply "Update BoxStation.dmm"

This reverts commit 7ae7933.

* redoes this manually

* fixes pyros dying and buckling bug

* potential fix

* more additions

* Update liquid_status_effect.dm

* what the fuck is wrong with the slow downs

* slime grinder

* prevents slimes from crushing roaches
  • Loading branch information
dwasint authored Apr 8, 2024
1 parent 01f77b5 commit 79ab513
Show file tree
Hide file tree
Showing 220 changed files with 11,592 additions and 8,256 deletions.
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/anomaly_research.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,6 @@
/obj/effect/turf_decal/siding/purple{
dir = 9
},
/obj/machinery/monkey_recycler,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/misc/anomaly_research)
Expand Down
21 changes: 8 additions & 13 deletions _maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,8 @@
/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"jC" = (
/mob/living/simple_animal/slime{
colour = "bluespace";
rabid = 1
/mob/living/basic/slime{
current_color = /datum/slime_color/bluespace
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/mineral/titanium/tiled/purple,
Expand Down Expand Up @@ -903,9 +902,8 @@
/turf/open/floor/mineral/titanium/tiled/white,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"wY" = (
/mob/living/simple_animal/slime{
colour = "bluespace";
rabid = 1
/mob/living/basic/slime{
current_color = /datum/slime_color/bluespace
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
Expand Down Expand Up @@ -1610,7 +1608,6 @@
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"JW" = (
/obj/machinery/light/broken/directional/north,
/obj/machinery/monkey_recycler,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"Kd" = (
Expand Down Expand Up @@ -2192,9 +2189,8 @@
dir = 10
},
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/slime{
colour = "bluespace";
rabid = 1
/mob/living/basic/slime{
current_color = /datum/slime_color/bluespace
},
/turf/open/floor/mineral/titanium/tiled/purple,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
Expand Down Expand Up @@ -2330,9 +2326,8 @@
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"Ze" = (
/mob/living/simple_animal/slime{
colour = "bluespace";
rabid = 1
/mob/living/basic/slime{
current_color = /datum/slime_color/bluespace
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/mineral/plastitanium,
Expand Down
20 changes: 4 additions & 16 deletions _maps/map_files/Basketball/lusty_xenomorphs.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
/turf/open/floor/engine,
/area/centcom/basketball)
"pu" = (
/mob/living/simple_animal/slime/random,
/mob/living/basic/slime/random,
/turf/open/floor/engine,
/area/centcom/basketball)
"qU" = (
Expand Down Expand Up @@ -529,18 +529,6 @@
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/iron/white,
/area/centcom/basketball)
"Se" = (
/obj/machinery/computer/camera_advanced/xenobio,
/turf/open/floor/iron/white,
/area/centcom/basketball)
"Tc" = (
/obj/machinery/monkey_recycler,
/turf/open/floor/iron/white,
/area/centcom/basketball)
"Uq" = (
/obj/machinery/processor/slime,
/turf/open/floor/iron/white,
/area/centcom/basketball)
"Uv" = (
/obj/effect/decal/cleanable/xenoblood/xgibs/torso,
/turf/open/floor/engine,
Expand Down Expand Up @@ -820,7 +808,7 @@ Hu
(9,1,1) = {"
Hu
Lu
Tc
JM
ly
AI
LS
Expand Down Expand Up @@ -901,7 +889,7 @@ Hu
(12,1,1) = {"
Hu
Lu
Se
JM
OB
Vr
Vr
Expand Down Expand Up @@ -982,7 +970,7 @@ Hu
(15,1,1) = {"
Hu
Lu
Uq
JM
ly
rU
LS
Expand Down
Loading

0 comments on commit 79ab513

Please sign in to comment.