Skip to content
This repository has been archived by the owner on Aug 21, 2023. It is now read-only.

New original map: MonkeDome #682

Draft
wants to merge 256 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
256 commits
Select commit Hold shift + click to select a range
26588a3
civilian stuff
ksuvi Aug 27, 2022
1a7bcb7
civ work
Sord213 Aug 27, 2022
90c9c45
monkeydome floors
Sord213 Aug 27, 2022
3a7c076
config
Sord213 Aug 28, 2022
1fa1937
config again
Sord213 Aug 28, 2022
b988ec8
mostlyfinal floor plan
Sord213 Aug 28, 2022
c425bf6
Areas
Sord213 Aug 29, 2022
63f7bb3
change brig physician's office to brig infirmary
Sord213 Aug 29, 2022
98db7de
security objects
Sord213 Aug 29, 2022
7a41d24
prison wing and more
Sord213 Sep 3, 2022
281108d
comsec stuff
Sord213 Sep 3, 2022
2201c0e
command stuff
Sord213 Sep 3, 2022
fcbc458
medbay work
Sord213 Sep 7, 2022
a8cee98
monkedome medical work
Sord213 Sep 9, 2022
6b789ff
research work
Sord213 Sep 10, 2022
27adb2b
add new turf decal colors, fix broken icon_states
Sord213 Sep 10, 2022
4b7f896
revert rename
Sord213 Sep 10, 2022
a22ca82
Merge branch 'tilecolors' of https://github.com/Sord213/MonkeStation …
Sord213 Sep 10, 2022
5bf83f6
stuff
Sord213 Sep 12, 2022
478e898
underscore
Sord213 Sep 12, 2022
005e27e
underscores for other pr because sad
Sord213 Sep 12, 2022
a87569e
Merge branch 'tilecolors' of https://github.com/Sord213/MonkeStation …
Sord213 Sep 12, 2022
32897d3
viro
Sord213 Sep 12, 2022
e318a1d
Merge branch 'master' of https://github.com/Monkestation/MonkeStation…
Sord213 Sep 12, 2022
6b1d4c2
Merge branch 'master' of https://github.com/Monkestation/MonkeStation…
Sord213 Sep 13, 2022
d313135
Research and more
Sord213 Sep 13, 2022
67cedad
Couple turfs and areas
Sord213 Sep 13, 2022
5de990e
civ/supply work
Sord213 Sep 15, 2022
661ee91
cargo, botany, other civ hub stuff
Sord213 Sep 20, 2022
3788058
Merge branch 'master' of https://github.com/Monkestation/MonkeStation…
Sord213 Sep 21, 2022
0936717
buncha stuff idk
Sord213 Sep 21, 2022
e6b78c3
emergency shuttle
Sord213 Sep 21, 2022
903146b
SM, other eng stuff, solar arrays
Sord213 Sep 22, 2022
360f229
few areas
Sord213 Sep 22, 2022
4c26deb
get outta here d1
Sord213 Sep 22, 2022
90feac3
initial airmix definition
Sord213 Sep 22, 2022
6f482cb
Merge branch 'master' of https://github.com/Monkestation/MonkeStation…
Sord213 Sep 26, 2022
ce15caa
solar area
Sord213 Sep 26, 2022
2ce6181
starting on powergrid
Sord213 Sep 26, 2022
3ae6104
more powernet stuff
Sord213 Sep 26, 2022
d595e78
more powernet stuff
Sord213 Sep 27, 2022
ae6cbfe
lights, starting on atmos, other stuff
Sord213 Sep 27, 2022
97da8c5
atmos dept, starting station atmos piping
Sord213 Sep 29, 2022
a4b2b9a
add solar array area
Sord213 Sep 29, 2022
5d1abfd
civ hub atmos connections
Sord213 Sep 29, 2022
d839aaf
use monkedome emerg shuttle
Sord213 Sep 30, 2022
acc575c
eng cameras and access spawners, comsec atmos, cameras, and access sp…
Sord213 Sep 30, 2022
e9b3960
medical and research atmos connections and cameras
Sord213 Oct 3, 2022
1381fd2
medical access spawners, res access spawners, civ access spawners and…
Sord213 Oct 7, 2022
ea450ec
add some missing access helpers
Sord213 Oct 7, 2022
111162e
some detail work, few additions, small stuff
Sord213 Oct 12, 2022
f6e618b
Merge branch 'master' of https://github.com/Monkestation/MonkeStation…
Sord213 Oct 12, 2022
e4058ca
config
Sord213 Oct 12, 2022
cabd057
light switch & recharger
dwasint Nov 12, 2022
20c2a45
smes
dwasint Nov 12, 2022
e672632
teg & smes
dwasint Nov 12, 2022
338c134
cccharger and fixes
dwasint Nov 12, 2022
677be99
reverts update_icon change
dwasint Nov 12, 2022
5e98140
updates emissives to a functional state and converts old emissives to…
dwasint Nov 12, 2022
ded45ab
canister and air alarm fixed
dwasint Nov 12, 2022
573ff3f
fixes air alarms, vending machine emissives, and reduces monitor brig…
dwasint Nov 12, 2022
bb4aadc
misinput
dwasint Nov 12, 2022
14b8306
more changes :)
dwasint Nov 12, 2022
c725a8f
more updates to glowing accessories
dwasint Nov 12, 2022
37db00c
more changes
dwasint Nov 12, 2022
618fbbc
air alarm icon fix
dwasint Nov 13, 2022
15a712e
Update sprite_accessories.dm
dwasint Nov 16, 2022
3757eee
fixes air alarms for the final time
dwasint Nov 16, 2022
7758383
layering number change
dwasint Nov 17, 2022
18ffcb5
changes pt1
dwasint Nov 17, 2022
8f97a43
Merge branch 'layering' into layering_take2
dwasint Nov 17, 2022
3910100
Layer overhaul
dwasint Nov 17, 2022
28be299
Rendering refactor P1: Plane unification and render relaying
dwasint Nov 17, 2022
5aa2214
changes
dwasint Nov 17, 2022
fc031f1
fixes weathers not rendering
dwasint Nov 17, 2022
b11200e
default to game plane
dwasint Nov 17, 2022
87b424d
fix here
dwasint Nov 17, 2022
22242e3
whoops
dwasint Nov 17, 2022
c1bd7fe
fixes player rendering
dwasint Nov 17, 2022
5b557d9
emissives microwaves,lights,buttons
dwasint Nov 17, 2022
2e8d3ae
newscasters and disposials
dwasint Nov 17, 2022
a717b5a
Merge branch 'layering' into layering_take2
dwasint Nov 18, 2022
ac71651
start of a working day system
dwasint Aug 29, 2022
b5aa942
makes system work on other z_levels
dwasint Aug 29, 2022
0568d43
Update _looping_sound.dm
dwasint Aug 29, 2022
29fd9df
Revert "Update _looping_sound.dm"
dwasint Nov 6, 2022
25dd016
adds thunder storm
dwasint Nov 18, 2022
9c05e92
Update beestation.dme
dwasint Nov 18, 2022
f70d386
basic of adding another weather system for mining z-levels and specia…
dwasint Nov 18, 2022
3056f03
gives admins a choice when running weathers
dwasint Nov 18, 2022
60163d8
hopefully gets the weather system to work on mining levels
dwasint Nov 18, 2022
e4f76c5
reorders files splits weather into individual files
dwasint Nov 18, 2022
2fbd863
changes to spaced variables
dwasint Nov 18, 2022
aee52e9
more variable changes
dwasint Nov 18, 2022
1a8d76b
adds leaf storm fixes dust storm
dwasint Nov 19, 2022
3f1b3dc
forgot this
dwasint Nov 19, 2022
8564f3d
Update _weather_particle.dm
dwasint Nov 19, 2022
71d6cb9
leaves
dwasint Nov 19, 2022
239c7e7
this needs tweakin
dwasint Nov 19, 2022
a7bdaa9
linters amirite
dwasint Nov 19, 2022
a81c246
Update weather.dm
dwasint Nov 19, 2022
7c4a91b
adds admin paint mode
dwasint Nov 20, 2022
1d24919
more fixes
dwasint Nov 20, 2022
ad4bdc3
real fixes
dwasint Nov 20, 2022
47015cd
more fixes
dwasint Nov 20, 2022
abae955
more fixes
dwasint Nov 20, 2022
4f3b112
fixes this aswell
dwasint Nov 20, 2022
43e4a82
Update _weather_type.dm
dwasint Nov 20, 2022
867ff83
Update _weather_type.dm
dwasint Nov 20, 2022
98e470f
changes things
dwasint Nov 20, 2022
0643f85
Update _weather_type.dm
dwasint Nov 20, 2022
1feb6b9
more fixes
dwasint Nov 20, 2022
70cc1fd
works again
dwasint Nov 21, 2022
5b3ac9f
Merge branch 'master' of https://github.com/Monkestation/MonkeStation…
Sord213 Jan 18, 2023
c83e562
Automatic changelog compile [ci skip]
monke-station-bot Jan 23, 2023
90a0c4f
Automatic changelog compile [ci skip]
monke-station-bot Jan 25, 2023
5c7cccc
start of working twitch integration
dwasint Jan 26, 2023
63cf7ca
Update request_handler.dm
dwasint Jan 27, 2023
499893f
Automatic changelog compile [ci skip]
monke-station-bot Jan 27, 2023
18d8719
rest of the handlers, adds 2 small effects more to come
dwasint Jan 27, 2023
c43bd76
Revert "rest of the handlers, adds 2 small effects more to come"
dwasint Jan 27, 2023
a2f095c
Revert "Update request_handler.dm"
dwasint Jan 27, 2023
a523ecc
Revert "start of working twitch integration"
dwasint Jan 27, 2023
15572df
Merge branch 'master' of https://github.com/dwasint/MonkeStation
dwasint Jan 27, 2023
c736120
Update world.dm
dwasint Feb 2, 2023
d2fb986
Merge branch 'master' into weather
dwasint Feb 2, 2023
c8422f1
Update weather.dm
dwasint Feb 2, 2023
fbdb8f0
Update blind_sense.dm
dwasint Feb 2, 2023
e5e98e9
Merge branch 'master' of https://github.com/Monkestation/MonkeStation…
Sord213 Feb 2, 2023
3298278
hopefully more fixes
dwasint Feb 2, 2023
14b4448
theatre, bridge, other misc landmarks everywhere
Sord213 Feb 2, 2023
dc69780
makes space be affected by night
dwasint Feb 2, 2023
0a70865
more basic changes
dwasint Feb 13, 2023
1644eea
more changes to make a z-level trait
dwasint Feb 13, 2023
505c2e0
Update outdoor_effects.dm
dwasint Feb 13, 2023
86bb95a
Update outdoor_effects.dm
dwasint Feb 13, 2023
b68fc67
Update outdoor_effects.dm
dwasint Feb 13, 2023
4b78fdd
Automatic changelog compile [ci skip]
monke-station-bot Feb 15, 2023
e73ff8f
Automatic changelog compile [ci skip]
monke-station-bot Feb 17, 2023
bba91b7
Automatic changelog compile [ci skip]
monke-station-bot Feb 19, 2023
6af3683
Automatic changelog compile [ci skip]
monke-station-bot Feb 23, 2023
1a66027
start of jungle stuff
dwasint Feb 25, 2023
2c35b89
Merge branch 'master' into monkeydome
dwasint Feb 25, 2023
5b2ab97
Update _basemap.dm
dwasint Feb 25, 2023
3814034
Update maps.txt
dwasint Feb 25, 2023
bd47a9b
Merge branch 'monkeydome' of https://github.com/Sord213/MonkeStation …
dwasint Feb 25, 2023
8d2d4a3
ranch
Sord213 Feb 25, 2023
0bcff7d
fixes and stuff
Sord213 Feb 25, 2023
d2c8185
more junk
Sord213 Feb 25, 2023
9c6bb70
buncha maint stuff, buncha other stuff
Sord213 Feb 25, 2023
da2f149
a ton of shit all at once
dwasint Feb 25, 2023
fb75c72
Merge branch 'monkeydome' of https://github.com/Sord213/MonkeStation …
dwasint Feb 25, 2023
25c741a
more fixes
dwasint Feb 26, 2023
5279fae
Merge branch 'weather' into pr/682
dwasint Feb 26, 2023
c09004b
runs
dwasint Feb 26, 2023
9e89bbd
Revert "Update outdoor_effects.dm"
dwasint Feb 26, 2023
8da7f3e
Revert "Update outdoor_effects.dm"
dwasint Feb 26, 2023
71344d4
Revert "Update outdoor_effects.dm"
dwasint Feb 26, 2023
c385b9d
Revert "more changes to make a z-level trait"
dwasint Feb 26, 2023
15c7ee4
this is a big change proper nights, and proper weathers
dwasint Feb 26, 2023
dfdd154
Update jungle_turfs.dm
dwasint Feb 26, 2023
7812551
damages fixed on hostiles
dwasint Feb 26, 2023
69d66f9
Merge branch 'master' into monkeydome
dwasint Feb 26, 2023
85f268a
fixes status effects, and slime sling progress bar
dwasint Feb 26, 2023
ef725a5
fixes runtimes
dwasint Feb 26, 2023
1a65efc
adds signal handlers to time shifts to allow for aggression changes b…
dwasint Feb 26, 2023
eb622d9
Update outdoor_effects.dm
dwasint Feb 26, 2023
7fe58bc
*farts loudly into microphone*
Sord213 Feb 26, 2023
7bc0070
ore generation
dwasint Feb 26, 2023
8dadb9c
Merge branch 'monkeydome' of https://github.com/Sord213/MonkeStation …
dwasint Feb 26, 2023
8075c53
Update JungleStation.dm
dwasint Feb 27, 2023
bfec3ba
map changes and area changes
dwasint Feb 27, 2023
93ef793
replaces all the airlock controllers with jungleland atmos ones
dwasint Feb 27, 2023
05b6307
removes gen turf inside xeno biology
dwasint Feb 27, 2023
70412e5
Merge branch 'Monkestation:master' into master
dwasint Feb 27, 2023
5754089
missing sprites added
dwasint Feb 27, 2023
3ab1cc7
Update actions.dm
dwasint Feb 27, 2023
012272d
Update actions.dm
dwasint Feb 27, 2023
b9d1c35
Update megafauna.dm
dwasint Feb 27, 2023
8b4a81c
start of ai changes
dwasint Feb 28, 2023
43d0a4e
more changes
dwasint Feb 28, 2023
8b70268
adds weathers to monkedome
dwasint Feb 28, 2023
7381dfc
weather fixes
dwasint Feb 28, 2023
d12b56f
more lfixes
dwasint Feb 28, 2023
db6ec0b
fixes and quarry addition
dwasint Feb 28, 2023
4888259
:)
dwasint Feb 28, 2023
190ea35
Update jungle_turfs.dm
dwasint Feb 28, 2023
1abcfc7
removes the mining shuttle
dwasint Feb 28, 2023
75a8be8
Update MonkeDome.dmm
dwasint Feb 28, 2023
351e318
Delete miningbase.dmm
dwasint Feb 28, 2023
6f94f26
Update jungleland_jungle_oldtemple.dmm
dwasint Feb 28, 2023
5b05384
Update obsidian_hard.dmi
dwasint Feb 28, 2023
bf85376
weirdly saved files be gone
dwasint Feb 28, 2023
676b8df
make genturf/areagen icons not murder my eyes
Sord213 Feb 28, 2023
fa6e5b3
Merge branch 'monkeydome' of https://github.com/Sord213/MonkeStation …
Sord213 Feb 28, 2023
f202e54
prob changes
dwasint Feb 28, 2023
a96fb77
whoops no no words
dwasint Feb 28, 2023
64ac84b
updates compile scripts
dwasint Mar 1, 2023
8a80c9b
Update dependencies.sh
dwasint Mar 1, 2023
37fe565
Update plane_master.dm
dwasint Mar 1, 2023
ce91f4a
changes names
dwasint Mar 1, 2023
1c38234
more fixes
dwasint Mar 2, 2023
66388bb
Automatic changelog compile [ci skip]
monke-station-bot Mar 3, 2023
4fb9376
changes harshness of space night colors
dwasint Mar 3, 2023
8c0deae
Merge branch 'master' into monkeydome
dwasint Mar 3, 2023
770d273
Update maps.dm
dwasint Mar 3, 2023
f8c48b9
Automatic changelog compile [ci skip]
monke-station-bot Mar 4, 2023
cd6e199
removes the day/night and weather system as it has client cost concerns
dwasint Mar 4, 2023
576cc40
Merge branch 'master' of https://github.com/dwasint/MonkeStation
dwasint Mar 4, 2023
582ff4f
removes sunlight remenants
dwasint Mar 9, 2023
16aaf70
part 2
dwasint Mar 9, 2023
c07b296
re-compiles the rust_g.dll locally to use the fixes to worley generat…
dwasint Mar 9, 2023
64214db
adds default lighting to jungle land
dwasint Mar 9, 2023
ea9b531
changes
dwasint Mar 12, 2023
9b93ad8
Automatic changelog compile [ci skip]
monke-station-bot Mar 12, 2023
cdceb2f
more weather changes
dwasint Mar 12, 2023
242724a
bunch of fixes
dwasint Mar 12, 2023
971006b
more fixes
dwasint Mar 12, 2023
9d637ec
Update jungleland_jungle_geode.dmm
dwasint Mar 12, 2023
ac6d1fa
more fixes
dwasint Mar 12, 2023
23b7922
fixes again
dwasint Mar 12, 2023
b7e774c
jank fix to accellerators not working proper when meleeing turf
dwasint Mar 12, 2023
e482773
Update jungle_turfs.dm
dwasint Mar 12, 2023
c060b57
Update jungle_turfs.dm
dwasint Mar 12, 2023
7f4738d
Update jungle_turfs.dm
dwasint Mar 12, 2023
0ef48ec
Update jungle_turfs.dm
dwasint Mar 12, 2023
ad905b0
Update jungle_turfs.dm
dwasint Mar 13, 2023
8e6e146
Update dependencies.sh
dwasint Mar 13, 2023
de78047
random plants spawn outside
dwasint Mar 13, 2023
af361ef
Update jungle_structures.dm
dwasint Mar 13, 2023
08c1c84
Update jungle_structures.dm
dwasint Mar 13, 2023
87a9967
fixes
Sord213 Mar 13, 2023
421544d
fixes
dwasint Mar 13, 2023
c96b5e7
Merge branch 'monkeydome' of https://github.com/Sord213/MonkeStation …
dwasint Mar 13, 2023
0ba7055
Update jungle_turfs.dm
dwasint Mar 13, 2023
c4859ea
few more things
Sord213 Mar 13, 2023
6f8acb2
Merge branch 'monkeydome' of https://github.com/Sord213/MonkeStation …
Sord213 Mar 13, 2023
faeb62b
fixes aoe
dwasint Mar 13, 2023
2de282a
fix missing lights, holopads, couple other things
Sord213 Mar 13, 2023
f32c865
Merge branch 'monkeydome' of https://github.com/Sord213/MonkeStation …
dwasint Mar 13, 2023
9d1d18f
removes jungle station bluespace and dilithium spawns
dwasint Mar 13, 2023
60a4562
botany explorer suit
Sord213 Mar 13, 2023
e965607
mining changes, botany changes, other misc stuff
Sord213 Mar 13, 2023
8c09e8e
changes
dwasint Mar 14, 2023
c269f7d
Merge branch 'monkeydome' of https://github.com/Sord213/MonkeStation …
dwasint Mar 14, 2023
26ec676
Automatic changelog compile [ci skip]
monke-station-bot Mar 16, 2023
4bd3228
Automatic changelog compile [ci skip]
monke-station-bot Mar 17, 2023
5e03a09
Merge branch 'Monkestation:master' into master
dwasint Mar 17, 2023
e15d473
Merge branch 'master' of https://github.com/dwasint/MonkeStation
dwasint Mar 17, 2023
72251e8
Merge branch 'master' into pr/682
dwasint Mar 17, 2023
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN dpkg --add-architecture i386 \
# Build rust-g
FROM rust-build as rustg
RUN git init \
&& git remote add origin https://github.com/BeeStation/rust-g \
&& git remote add origin https://github.com/tgstation/rust-g \
&& /bin/bash -c "source dependencies.sh \
&& git fetch --depth 1 origin \$RUST_G_VERSION" \
&& git checkout FETCH_HEAD \
Expand Down
148 changes: 148 additions & 0 deletions _maps/RandomRuins/JungleRuins/jungleland_barren_drake.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions _maps/RandomRuins/JungleRuins/jungleland_barren_nest.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

216 changes: 216 additions & 0 deletions _maps/RandomRuins/JungleRuins/jungleland_dead_bubblegum.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading