 Chloe
|
c2d0b95ef8
|
Merge pull request #15 from quotefox/master
update unga
|
2021-05-01 04:28:42 +01:00 |
|
|
QuoteFox
|
3b5f86d460
|
fixes
|
2021-05-01 03:45:00 +01:00 |
|
|
QuoteFox
|
ae9bd1d961
|
more decals and floor types
|
2021-05-01 03:17:41 +01:00 |
|
|
Dahlular
|
fe9b6915fa
|
Merge pull request #1109 from DragonTrance/various-misc-2
Update dynamic_rulesets_events.dm
|
2021-04-30 18:42:04 -06:00 |
|
|
DragonTrance
|
c43622dfc9
|
Update dynamic_rulesets_events.dm
|
2021-04-30 17:38:12 -07:00 |
|
|
Dahlular
|
bc4dfa9fdb
|
Merge pull request #1106 from ToonClyde/more-camera-crap
fix cameras and added more
|
2021-04-30 16:17:33 -06:00 |
|
|
ToonClyde
|
0e160102fc
|
fix cameras and added more
|
2021-04-30 14:40:26 -07:00 |
|
|
Dahlular
|
0caff248b9
|
Merge pull request #1105 from Dahlular/wockyslush
Pirates, Greytide, and Wocky Slush
|
2021-04-30 15:04:54 -06:00 |
|
|
Dahlular
|
231425e0a2
|
pirates, greytide, and wocky slush
|
2021-04-30 15:01:13 -06:00 |
|
|
Dahlular
|
850e45c085
|
Merge pull request #1104 from Dahlular/dontfuckingbreakshit
fixes some damn pipes
|
2021-04-30 13:06:27 -06:00 |
|
|
Dahlular
|
a1503ec0fa
|
fixes some damn pipes
|
2021-04-30 13:03:31 -06:00 |
|
|
QuoteFox
|
6d0df8eed6
|
Revert "Merge pull request #1103 from Dahlular/hate"
This reverts commit 943782d9e9, reversing
changes made to 361a8e42fb.
|
2021-04-30 12:13:23 +01:00 |
|
|
QuoteFox
|
8e192e269b
|
Revert "literally cannot be assed anymore"
This reverts commit 2c71794490.
|
2021-04-30 12:13:20 +01:00 |
|
|
Dahlular
|
2c71794490
|
literally cannot be assed anymore
i'm gonna get some sleep and fix this stuff tomorrow
|
2021-04-30 04:46:43 -06:00 |
|
|
Dahlular
|
943782d9e9
|
Merge pull request #1103 from Dahlular/hate
Clearing some runtimes
|
2021-04-30 04:27:18 -06:00 |
|
|
Dahlular
|
cc57ef29e6
|
Clearing some runtimes
|
2021-04-30 04:23:02 -06:00 |
|
|
Dahlular
|
361a8e42fb
|
Merge pull request #1102 from Dahlular/grabity
fixin' shitcode
|
2021-04-30 03:25:15 -06:00 |
|
|
Dahlular
|
706921f227
|
Merge remote-tracking branch 'upstream/master' into grabity
|
2021-04-30 03:24:50 -06:00 |
|
|
Dahlular
|
2576686a1a
|
please for the love of god
|
2021-04-30 03:22:33 -06:00 |
|
|
Dahlular
|
9ffb1c10a1
|
shits my code
|
2021-04-30 02:54:56 -06:00 |
|
|
Dahlular
|
55017a80bb
|
unshits my code
|
2021-04-30 02:28:10 -06:00 |
|
|
Dahlular
|
80a8b1bf8d
|
Merge pull request #1101 from ArchieBeepBoop/followthetraincj
Permanently enable Gravity within Layenia Station
|
2021-04-30 00:18:18 -06:00 |
|
|
Archie
|
818c9dd414
|
All you had to do was follow the damn train CJ
|
2021-04-30 03:09:42 -03:00 |
|
|
Dahlular
|
68d4357dc7
|
Merge pull request #1100 from Dahlular/aaaaaaaa
THE TWENTY FIRST NIGHT OF SEPTEMBER
|
2021-04-30 00:04:05 -06:00 |
|
|
Dahlular
|
fc22aaedf4
|
MORE FUCKJIGN FIXES
|
2021-04-30 00:00:41 -06:00 |
|
|
Dahlular
|
3fe0c2e584
|
Merge pull request #1099 from Dahlular/COUNTERSTRIKESOURCE
adds a dug state to layenia rock
|
2021-04-29 23:48:55 -06:00 |
|
|
Dahlular
|
31a0b937e4
|
adds a dug state to layenia rock
|
2021-04-29 23:47:55 -06:00 |
|
|
Dahlular
|
299c3d55d3
|
Merge pull request #1098 from ToonClyde/add-stuff
cameras in engineering fix
|
2021-04-29 23:38:44 -06:00 |
|
|
ToonClyde
|
861c2e4cd5
|
cameras in engineering fix
|
2021-04-29 22:35:16 -07:00 |
|
|
Dahlular
|
473538f615
|
Merge pull request #1097 from ArchieBeepBoop/lolfloorvariance
Fixes layenia floor variance.
|
2021-04-29 23:17:09 -06:00 |
|
|
Archie
|
d75ac90a3b
|
Fixes layenia floor variance.
|
2021-04-30 02:14:09 -03:00 |
|
|
Dahlular
|
d908d703ee
|
Merge pull request #1096 from Dahlular/aoaooaoaoaoa
map fixes and map updates galore!
|
2021-04-29 22:34:47 -06:00 |
|
|
Dahlular
|
39373ccdac
|
map fixes and map updates galore!
|
2021-04-29 22:24:05 -06:00 |
|
|
Dahlular
|
9bef7d26ef
|
Merge pull request #1095 from Dahlular/layeniafixes2
More Layenia Fixes, Engineering Edition
|
2021-04-29 22:08:18 -06:00 |
|
|
Dahlular
|
bdd2bbf154
|
Fixes some missing pipes + radiation closets and rad proofs TEG burn chamber
|
2021-04-29 22:03:08 -06:00 |
|
|
Dahlular
|
eb551360c6
|
Merge pull request #1092 from Dahlular/layeniafixes
Layeniafixes
|
2021-04-29 21:36:52 -06:00 |
|
|
Dahlular
|
6fdad95b5d
|
Merge pull request #1093 from ArchieBeepBoop/qdel
Fixes null gases and air runtimes that plague layenia
|
2021-04-29 21:36:27 -06:00 |
|
|
Archie
|
6d58efc6b9
|
Fixes null gases and air runtimes that plague layenia
|
2021-04-30 00:32:10 -03:00 |
|
|
Dahlular
|
4d2d4df8b3
|
makes wind quieter from inside
|
2021-04-29 21:29:50 -06:00 |
|
|
Dahlular
|
90ba8f2b64
|
Map fixes, gravity fixes, many fixes
|
2021-04-29 21:21:52 -06:00 |
|
|
Dahlular
|
16fc2658b8
|
Merge pull request #1091 from Dahlular/cumcom
Layenia Station
|
2021-04-29 17:49:23 -06:00 |
|
|
Dahlular
|
4150636fa4
|
Revert "Revert "Merge branch 'master' into cumcom""
This reverts commit c2cc5c49c6.
|
2021-04-29 17:46:09 -06:00 |
|
|
Dahlular
|
c2cc5c49c6
|
Revert "Merge branch 'master' into cumcom"
This reverts commit 05c4645c35, reversing
changes made to d3867f491b.
|
2021-04-29 17:44:13 -06:00 |
|
|
Dahlular
|
05c4645c35
|
Merge branch 'master' into cumcom
|
2021-04-29 17:43:57 -06:00 |
|
|
Dahlular
|
d3867f491b
|
conflict fixies
|
2021-04-29 17:37:37 -06:00 |
|
|
Dahlular
|
3cefcf6eb1
|
Merge remote-tracking branch 'upstream/master'
|
2021-04-29 17:24:55 -06:00 |
|
|
Dahlular
|
ad59e6913f
|
alright, cannot be assed
|
2021-04-29 16:59:21 -06:00 |
|
|
ToonClyde
|
6eb17d3ecf
|
missed one little thing
|
2021-04-29 14:51:26 -07:00 |
|
|
ToonClyde
|
a741e22937
|
last minute detail work
|
2021-04-29 14:49:15 -07:00 |
|
|
QuoteFox
|
f16f461913
|
reward fix
|
2021-04-29 21:02:46 +01:00 |
|