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

Ouroboros and Voidraptor #2439

Merged
merged 114 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from 67 commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
a3607a9
voidraptor initial save
dwasint Jun 27, 2024
1358e4e
blacksmith
dwasint Jun 27, 2024
d563465
prison
dwasint Jun 27, 2024
605e1ab
voidraptor config
dwasint Jun 27, 2024
53d827c
ouroboros
dwasint Jun 27, 2024
fd9c1b6
moon turfs
dwasint Jun 27, 2024
6f6a3c1
adds lunar decal
dwasint Jun 27, 2024
1ecd3d5
new xeno
dwasint Jun 27, 2024
33affc3
lights
dwasint Jun 27, 2024
83dd7b8
Update VoidRaptor.dmm
dwasint Jun 27, 2024
cfc8845
adds chicken and botany books
dwasint Jun 27, 2024
631decf
blueshift pen fix
dwasint Jun 27, 2024
3072989
pool fix
dwasint Jun 27, 2024
d7facfc
shuttles
dwasint Jun 27, 2024
f3ccc31
Revert "lights"
dwasint Jun 27, 2024
98b6229
Reapply "lights"
dwasint Jun 27, 2024
c262b95
fixes
dwasint Jun 27, 2024
95a3d7e
new chem synths aswell
dwasint Jun 27, 2024
bfc7b86
fixes
dwasint Jun 27, 2024
a19cfbf
Update VoidRaptor.dmm
dwasint Jun 27, 2024
311baf9
fixes
dwasint Jun 27, 2024
d392ad9
Update Ouroboros.dmm
dwasint Jun 27, 2024
9f2085b
Update Ouroboros.dmm
dwasint Jun 27, 2024
4a30109
Update VoidRaptor.dmm
dwasint Jun 28, 2024
4373823
Update VoidRaptor.dmm
dwasint Jun 28, 2024
c95d3ec
fuckin hate fake stairs
dwasint Jun 28, 2024
85c8155
bloop
dwasint Jun 28, 2024
f58e1e3
Bumps rust-g to `3.3.0` (#83635)
GoldenAlpharex Jun 3, 2024
0806a20
Adds Biomes to the Cave Generator, for all of your procedurally-place…
GoldenAlpharex Jun 4, 2024
8cd5586
adds in base forest and mushroom forest generation
dwasint Jun 28, 2024
2d75ff8
makes it work
dwasint Jun 28, 2024
a47e2ce
Update Ouroboros.dmm
dwasint Jun 28, 2024
a04cc88
Update Ouroboros.dmm
dwasint Jun 28, 2024
8e4b29e
Update signals_atom.dm
dwasint Jun 28, 2024
1cca092
Update signals_atom.dm
dwasint Jun 28, 2024
4c6d2d1
:)
dwasint Jun 28, 2024
a761e15
spawnable colony kit, atmospherics changes for forest, eclipse? new m…
dwasint Jun 29, 2024
1f5ed1c
Update particle_weather.dm
dwasint Jun 29, 2024
4410add
fixes
dwasint Jun 29, 2024
1d2af9f
Update misc_procs.dm
dwasint Jun 29, 2024
dc59c28
Delete wolf.dm
dwasint Jun 29, 2024
851e435
fixes grass dug
dwasint Jun 29, 2024
94ee995
guh
dwasint Jun 29, 2024
96848b7
Update eclipse.dmm
dwasint Jun 29, 2024
26be0cc
Update frontier.dm
dwasint Jun 29, 2024
e71171b
Update frontier.dm
dwasint Jun 29, 2024
dc6db28
Update new_turfs.dm
dwasint Jun 29, 2024
5e5e1b0
-2 for eclipse
dwasint Jun 29, 2024
a597dd6
eclipse is halved
dwasint Jun 30, 2024
2a7fa51
fixes bulk splits breaking liquids for the rest of the round
dwasint Jun 30, 2024
01a7621
more colony stuff
dwasint Jun 30, 2024
c5df12c
Update new_turfs.dm
dwasint Jun 30, 2024
c2bf044
Update food_or_drink.dm
dwasint Jun 30, 2024
8f752f9
Update all_nodes.dm
dwasint Jun 30, 2024
2988987
Update all_nodes.dm
dwasint Jun 30, 2024
99fef08
misc fixes
dwasint Jun 30, 2024
2290b36
fixes rain sounds on eclipse
dwasint Jun 30, 2024
71ac102
adds seedmesh design to organic printer
dwasint Jun 30, 2024
672eff7
removes some plushies
dwasint Jul 1, 2024
372bbfb
removes another plush
dwasint Jul 1, 2024
1aa6cb2
fixes
dwasint Jul 1, 2024
3d12855
better sounds for eclipse
dwasint Jul 1, 2024
e5d1b0e
Update areas.dm
dwasint Jul 1, 2024
084c234
adds a way to have mobs temporarily target objects until hit
dwasint Jul 2, 2024
0c6e4b3
restart spawner signal
dwasint Jul 2, 2024
bfca3b1
Update new_turfs.dm
dwasint Jul 2, 2024
881c3ea
fixes bloom
dwasint Jul 2, 2024
48d8da7
removes bb block
dwasint Jul 3, 2024
15af64f
Update VoidRaptor.dmm
dwasint Jul 3, 2024
4142a61
fixes maps
dwasint Jul 3, 2024
20cf8bb
adds wall lockers and shelf recipes
dwasint Jul 4, 2024
765f1ec
base of the extractor
dwasint Jul 4, 2024
e51d229
Merge branch 'master' into new_maps_galore
dwasint Jul 4, 2024
aae38af
new icons
dwasint Jul 5, 2024
a2ad058
Merge branch 'new_maps_galore' of https://github.com/dwasint/Monkesta…
dwasint Jul 5, 2024
e40b574
fixes
dwasint Jul 5, 2024
8e42404
Update armament.dm
dwasint Jul 5, 2024
52ce27e
Merge branch 'master' into new_maps_galore
dwasint Jul 5, 2024
b919ade
alot of new stuff all at once
dwasint Jul 6, 2024
641f85b
whoops
dwasint Jul 6, 2024
8edfd49
Merge branch 'new_maps_galore' of https://github.com/dwasint/Monkesta…
dwasint Jul 6, 2024
416676e
whoops
dwasint Jul 6, 2024
bd453df
Update AntagInfoAssaultops.tsx
dwasint Jul 6, 2024
005884a
more stuff
dwasint Jul 6, 2024
b0abb89
Update CentCom.dmm
dwasint Jul 6, 2024
e62c648
Update goldeneye_cruiser.dmm
dwasint Jul 6, 2024
dd45aea
more fixes
dwasint Jul 6, 2024
74e936e
Update _base_event.dm
dwasint Jul 6, 2024
b47a9bc
whoops
dwasint Jul 6, 2024
b2437f0
stamps
dwasint Jul 6, 2024
c5d604d
voidraptor and blueshift maint access cleanup
dwasint Jul 6, 2024
af6c2f1
Update Ouroboros.dmm
dwasint Jul 6, 2024
700d6ed
Update Ouroboros.dmm
dwasint Jul 6, 2024
76facdd
changes
dwasint Jul 6, 2024
8947821
access fixes pinpointers
dwasint Jul 6, 2024
1de2535
Update goldeneye_cruiser.dmm
dwasint Jul 6, 2024
7776c1b
removes the forced event after run
dwasint Jul 6, 2024
331dcf3
reruns update_icon_state to force the empty mags to be empty
dwasint Jul 7, 2024
a0e8347
Portal To Hell
dwasint Jul 7, 2024
6c4e994
fixes
dwasint Jul 10, 2024
f1e79ff
Update rust_g.dll
dwasint Jul 12, 2024
5739d34
admin retirement home
dwasint Jul 12, 2024
f11f7d6
Revert "admin retirement home"
dwasint Jul 12, 2024
e070636
Update misc_pets.dm
dwasint Jul 25, 2024
e613047
Update machinery.dm
dwasint Jul 25, 2024
b713568
missing icons
dwasint Jul 26, 2024
9e79af7
Update new_turfs.dm
dwasint Jul 26, 2024
0ebaa41
fixes
dwasint Jul 26, 2024
71a7d18
more stuff
dwasint Jul 26, 2024
9e85e22
changes
dwasint Jul 26, 2024
bcd1892
Update shuttle.dm
dwasint Jul 26, 2024
f6d2857
Update shuttle.dm
dwasint Jul 26, 2024
0bec066
Update VoidRaptor.dmm
dwasint Jul 26, 2024
645fd61
fixes
dwasint Jul 26, 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
10 changes: 9 additions & 1 deletion _maps/map_files/Blueshift/Blueshift.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2057,6 +2057,10 @@
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 8
},
/obj/item/botanical_lexicon,
/obj/item/botanical_lexicon,
/obj/item/botanical_lexicon,
/obj/item/botanical_lexicon,
/turf/open/floor/iron/dark/corner{
dir = 1
},
Expand Down Expand Up @@ -23015,7 +23019,7 @@
/obj/effect/turf_decal/siding/thinplating/light,
/obj/machinery/door/window/left/directional/south{
name = "Monkey Pen";
req_access = list("virology")
req_access = list("pathology")
},
/turf/open/floor/grass,
/area/station/medical/virology/isolation)
Expand Down Expand Up @@ -84395,6 +84399,10 @@
name = "hallway camera"
},
/obj/machinery/feed_machine,
/obj/item/chicken_book,
/obj/item/chicken_book,
/obj/item/chicken_book,
/obj/item/chicken_book,
/turf/open/floor/iron/dark/side{
dir = 1
},
Expand Down
Loading
Loading