Skip to content

Commit

Permalink
Ranching: A new Horizon (#2017)
Browse files Browse the repository at this point in the history
* Update happiness_container.dm

* sheep start

* gestation now works, adds breeding to sheep

* part 1

* Update _mutations.dm

* fixes

* Update sheep.dmi

* Update climbable.dm

* Update botany.dm

* adds favorite foods to chickens, makes roosters required.

* Update _chicken.dm

* Update void.dm

* start of satyrs

* Update soda.dm

* Update prefs.dm

* Update species.dm

* Update _cup.dm

* guh

* fixes

* Update tier3.dm

* fixes the meat slapping of satyrs feet

* Update species.dm

* rng punch removal, boxing stamina doubled

* makes admin notification sounds use generic sounds which ignore area environments which reduces large echos

* Update _base.dm

* map stuff

* Update areas.dm

* Update clockwork_cult.dm

* randomness in the animates replaces confetti with new system as a showcase

* moves particles that don't use advanced matrixes into animate_holder

* Update clockwork_cult.dm

* fixes

* Update pill_names.json

* dash

* Update abilities.dm

* Update abilities.dm

* Update create_and_destroy.dm

* guh

* Create screenshot_humanoids__datum_species_satyr.png

* requires a rooster to be around for fertile eggs to be laid

* makes dashing and headbutting face target

* adds cassette db

* start of critters

* fixes

* meta critter spawns

* Update cockatrice.dm

* Update cockatrice.dm

* Update cockatrice.dm

* Update client_addons.dm

* start of loki post

* why

* Update attack.dm

* Update subsystem.dm

* Update subsystem.dm

* Update subsystem.dm

* Update subsystem.dm

* for now I gotta remove cause fucking json_encode

* Update tgstation.dme

* adds ckey locks to other pets

* more stuff removes nullspace stack trace cause thats wrong

* wompers

* Revert "for now I gotta remove cause fucking json_encode"

This reverts commit 49a2265.

* please for the love of god do not merge on live

* user logging done

* changes that may be needed

* Update _logging.dm

* Revert "Update _logging.dm"

This reverts commit 2a00a3b.

* Revert "changes that may be needed"

This reverts commit 6505847.

* Revert "user logging done"

This reverts commit e57bcf3.

* Revert "please for the love of god do not merge on live"

This reverts commit 7595134.

* Reapply "for now I gotta remove cause fucking json_encode"

This reverts commit 815aa0e.

* Update client_addons.dm

* changes up how exposures are processed so its done in batches of 500

* fixes some issues
  • Loading branch information
dwasint authored Jun 13, 2024
1 parent 08220f4 commit 0a89554
Show file tree
Hide file tree
Showing 137 changed files with 12,247 additions and 8,982 deletions.
599 changes: 397 additions & 202 deletions _maps/map_files/BoxStation/BoxStation.dmm

Large diffs are not rendered by default.

12,650 changes: 6,383 additions & 6,267 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Large diffs are not rendered by default.

506 changes: 350 additions & 156 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm

Large diffs are not rendered by default.

51 changes: 30 additions & 21 deletions _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8157,6 +8157,9 @@
/area/station/hallway/primary/central)
"cGR" = (
/obj/machinery/light/small/directional/south,
/mob/living/basic/chicken{
forced_gender = "female"
},
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"cHg" = (
Expand Down Expand Up @@ -22288,6 +22291,13 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"hfR" = (
/obj/structure/flora/bush/flowers_br/style_random,
/mob/living/basic/chicken/brown{
forced_gender = "female"
},
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"hfV" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
Expand Down Expand Up @@ -23757,6 +23767,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/security/prison/mess)
"hDP" = (
/mob/living/basic/chicken/brown{
forced_gender = "male"
},
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"hDV" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
Expand Down Expand Up @@ -53074,11 +53090,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"rcd" = (
/obj/structure/flora/bush/flowers_br/style_random,
/mob/living/basic/chicken,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"rcj" = (
/obj/structure/toilet,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -54345,16 +54356,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"rwp" = (
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 8
},
/mob/living/basic/chicken,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"rwr" = (
/turf/closed/wall/rust,
/area/station/medical/psychology)
Expand Down Expand Up @@ -69153,6 +69154,15 @@
/mob/living/simple_animal/bot/secbot/beepsky/officer,
/turf/open/floor/iron/dark,
/area/station/security/office)
"vYu" = (
/obj/structure/railing{
dir = 1
},
/mob/living/basic/chicken{
forced_gender = "male"
},
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"vYx" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
Expand Down Expand Up @@ -69518,7 +69528,6 @@
/turf/open/floor/iron,
/area/station/cargo/storage)
"wej" = (
/mob/living/basic/chicken,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
Expand Down Expand Up @@ -110315,8 +110324,8 @@ jHT
xWu
eHZ
ipq
doE
rcd
vYu
bNZ
arl
qHT
lzv
Expand Down Expand Up @@ -111343,7 +111352,7 @@ kDK
fcR
qDO
irz
bNZ
hfR
vcc
arl
arl
Expand Down Expand Up @@ -111598,9 +111607,9 @@ eYd
fmV
pqu
bKu
rwp
irz
aUi
mqr
hDP
mqr
gQv
abn
Expand Down
Loading

0 comments on commit 0a89554

Please sign in to comment.