Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ranching: A new Horizon #2017

Merged
merged 79 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from 77 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
5166751
Update happiness_container.dm
dwasint May 26, 2024
e34dc39
sheep start
dwasint May 26, 2024
3c83253
gestation now works, adds breeding to sheep
dwasint May 26, 2024
c07b265
Merge branch 'master' into ranching2.0
dwasint May 27, 2024
e4eeb76
part 1
dwasint May 27, 2024
23236a8
Update _mutations.dm
dwasint May 27, 2024
df9fa4d
fixes
dwasint May 27, 2024
ac9640d
Update sheep.dmi
dwasint May 27, 2024
0029d56
Update climbable.dm
dwasint May 27, 2024
a7482e0
Update botany.dm
dwasint May 27, 2024
82ecd1b
adds favorite foods to chickens, makes roosters required.
dwasint May 27, 2024
7fb5baf
Update _chicken.dm
dwasint May 27, 2024
c43cf7d
Update void.dm
dwasint May 28, 2024
fd2c49b
start of satyrs
dwasint May 28, 2024
529de92
Update soda.dm
dwasint May 28, 2024
507f755
Update prefs.dm
dwasint May 28, 2024
ffce8fa
Update species.dm
dwasint May 28, 2024
88a7e24
Update _cup.dm
dwasint May 28, 2024
d321d5b
guh
dwasint May 29, 2024
2869248
fixes
dwasint May 29, 2024
b9cb1b1
Update tier3.dm
dwasint May 29, 2024
305ca7b
fixes the meat slapping of satyrs feet
dwasint May 29, 2024
4f9aac4
Update species.dm
dwasint May 29, 2024
e87bf56
rng punch removal, boxing stamina doubled
dwasint May 29, 2024
bbcfd26
makes admin notification sounds use generic sounds which ignore area …
dwasint May 29, 2024
f317862
Update _base.dm
dwasint May 30, 2024
3bed159
map stuff
dwasint Jun 1, 2024
0b3f304
Merge branch 'master' into ranching2.0
dwasint Jun 1, 2024
b885b83
Update areas.dm
dwasint Jun 1, 2024
3b05a2c
Merge branch 'master' into ranching2.0
dwasint Jun 1, 2024
bb2ad58
Update clockwork_cult.dm
dwasint Jun 1, 2024
1082298
randomness in the animates replaces confetti with new system as a sho…
dwasint Jun 2, 2024
01178fe
moves particles that don't use advanced matrixes into animate_holder
dwasint Jun 3, 2024
cb1c5df
Update clockwork_cult.dm
dwasint Jun 3, 2024
3e914bb
fixes
dwasint Jun 3, 2024
0f46f04
Merge branch 'master' into ranching2.0
dwasint Jun 3, 2024
39cfa41
Update pill_names.json
dwasint Jun 3, 2024
7d32a72
dash
dwasint Jun 6, 2024
e1faf7b
Update abilities.dm
dwasint Jun 6, 2024
8921a14
Update abilities.dm
dwasint Jun 6, 2024
15c17c3
Update create_and_destroy.dm
dwasint Jun 6, 2024
9fb4ea2
guh
dwasint Jun 6, 2024
5b74fbc
Create screenshot_humanoids__datum_species_satyr.png
dwasint Jun 6, 2024
6b10c53
requires a rooster to be around for fertile eggs to be laid
dwasint Jun 7, 2024
6385b04
makes dashing and headbutting face target
dwasint Jun 7, 2024
dd0d1de
adds cassette db
dwasint Jun 7, 2024
3c6dba3
start of critters
dwasint Jun 8, 2024
b6cf57b
Merge branch 'master' into ranching2.0
dwasint Jun 8, 2024
37adcfd
fixes
dwasint Jun 8, 2024
5c58dde
meta critter spawns
dwasint Jun 8, 2024
657fa62
Update cockatrice.dm
dwasint Jun 8, 2024
e79e551
Update cockatrice.dm
dwasint Jun 8, 2024
6cd9420
Update cockatrice.dm
dwasint Jun 8, 2024
d997946
Update client_addons.dm
dwasint Jun 8, 2024
853f582
start of loki post
dwasint Jun 9, 2024
f27d36f
why
dwasint Jun 9, 2024
2dad56a
Update attack.dm
dwasint Jun 9, 2024
1e4ee5e
Update subsystem.dm
dwasint Jun 9, 2024
a242232
Update subsystem.dm
dwasint Jun 9, 2024
0b49716
Update subsystem.dm
dwasint Jun 9, 2024
b8e2c69
Update subsystem.dm
dwasint Jun 9, 2024
49a2265
for now I gotta remove cause fucking json_encode
dwasint Jun 10, 2024
0ae5e18
Update tgstation.dme
dwasint Jun 10, 2024
4614f1c
adds ckey locks to other pets
dwasint Jun 10, 2024
8186704
more stuff removes nullspace stack trace cause thats wrong
dwasint Jun 10, 2024
a596323
wompers
dwasint Jun 10, 2024
815aa0e
Revert "for now I gotta remove cause fucking json_encode"
dwasint Jun 10, 2024
7595134
please for the love of god do not merge on live
dwasint Jun 10, 2024
e57bcf3
user logging done
dwasint Jun 10, 2024
6505847
changes that may be needed
dwasint Jun 10, 2024
2a00a3b
Update _logging.dm
dwasint Jun 10, 2024
a653f7b
Revert "Update _logging.dm"
dwasint Jun 11, 2024
5a1f17e
Revert "changes that may be needed"
dwasint Jun 11, 2024
a5f2e2a
Revert "user logging done"
dwasint Jun 11, 2024
66b287c
Revert "please for the love of god do not merge on live"
dwasint Jun 11, 2024
248806e
Reapply "for now I gotta remove cause fucking json_encode"
dwasint Jun 11, 2024
2eb7c0c
Update client_addons.dm
dwasint Jun 11, 2024
1776b72
changes up how exposures are processed so its done in batches of 500
dwasint Jun 12, 2024
86df286
fixes some issues
dwasint Jun 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading