Commit Graph

960 Commits

Author SHA1 Message Date
BlackMajor
a925cea027 Fix travis POIs 2021-02-19 12:26:27 +13:00
Captain277
91a74ce6b6 Changes code so the Warden's shotgun updates in-hands. Fixes Enviro Sensors on LL. 2021-02-18 07:28:21 -08:00
Captain277
4a93253125 Adds a drill thingy. 2021-02-18 04:46:31 -08:00
Captain277
181d6057f2 Places the correct medkits in Lavaland base. 2021-02-18 04:17:11 -08:00
Captain277
6dcf90654e Lavaland specific cyber mobs/special mobs and Lavaland Pressure drop to assist KA. 2021-02-17 21:33:08 -08:00
Captain277
bcbb917e1c Power and stair adjustments. 2021-02-17 19:26:46 -08:00
Captain277
b8dcfc70da Adds a small sign. 2021-02-17 06:33:20 -08:00
Captain277
d93708722d Lavaland POI beautification. 2021-02-17 06:01:03 -08:00
Captain277
2a22694e4c Adjusting the Lavaland Base p1. 2021-02-17 00:30:10 -08:00
Captain277
c6aa7b4f26 Science ship gets re-checked for vacuum too. 2021-02-16 20:33:04 -08:00
Captain277
247d6bef0e Juggles lavaland turfs to try and fix the ore distro issue. Fixes active edges? 2021-02-16 19:59:41 -08:00
silicons
3c488336fc ok 2021-02-15 05:57:26 -07:00
silicons
b0dc769069 send sound 2021-02-15 05:19:52 -07:00
lolman360
ec7b308124 aaaaaaaaaaa 2 2021-02-15 17:30:11 +11:00
lolman360
706f97324f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-RP into tgui4examinetake2 2021-02-15 16:56:36 +11:00
silicons
1c11a4bdd1 Merge remote-tracking branch 'citrp/master' into init_1 2021-02-14 03:42:08 -07:00
silicons
b3a4fa802b jfc 2021-02-14 03:04:42 -07:00
silicons
afad8c53ec 39 2021-02-14 02:09:50 -07:00
lolman360
7dbbda13a0 Merge branch 'tgui-tgui-tgui-tgui' of https://github.com/LetterN/Citadel-Station-13-RP into tgui4 2021-02-14 16:18:37 +11:00
silicons
0fcba969d8 lineendings 2021-02-13 21:26:36 -07:00
silicons
774f8db8a6 holy shit 2021-02-13 21:25:44 -07:00
BlackMajor
7f7796687c fix one bug ya got 99 more 2021-02-14 16:55:38 +13:00
BlackMajor
6339ffdbf2 lavaland fixes 2021-02-14 16:41:18 +13:00
BlackMajor
35998ff33d Update Boathouse.dmm 2021-02-14 15:39:57 +13:00
BlackMajor
f130362dab make travis happy 2021-02-14 04:29:14 +13:00
BlackMajor
bcc6298192 missed a spot 2021-02-14 04:11:43 +13:00
BlackMajor
6cf79d1188 Go big or go home 2021-02-14 04:01:34 +13:00
BlackMajor
2e3d0d0bc2 Missed a spot 2021-02-13 09:51:08 +13:00
BlackMajor
7404edcd8d I scream 2021-02-13 02:05:04 +13:00
BlackMajor
de797a7304 *scream 2021-02-12 16:22:38 +13:00
BlackMajor
30adf3bb9b conflictn't 2021-02-12 15:31:47 +13:00
BlackMajor
10c9b619e2 Merge branch 'master' into consolidate 2021-02-12 15:26:17 +13:00
BlackMajor
0ac824399b Area consolidation 2021-02-12 15:22:47 +13:00
harry3124
3d0af699c9 Bug fix 2021-02-10 14:56:09 +09:00
buffyuwu
b5aaedb252 uhhhh 2021-02-09 13:50:00 -05:00
buffyuwu
e81c5b6dac lets not teleport ai cores lol 2021-02-08 22:31:52 -05:00
buffyuwu
b5cdb533ae normalize 2021-02-07 21:36:34 -05:00
buffyuwu
178634f239 should be good on issues 2021-02-07 17:54:50 -05:00
buffyuwu
c761d4fc3e buffy fix 2 planets in 1 commit 2021-02-07 16:24:42 -05:00
buffyuwu
f9a0cad3c8 this should be fine 2021-02-07 13:39:50 -05:00
buffyuwu
1d50e09581 map fix 2021-02-07 13:23:44 -05:00
buffyuwu
da4989ccf0 Update lavaland.dmm 2021-02-07 13:14:25 -05:00
buffyuwu
0e5970c898 Update _lavaland.dm 2021-02-07 12:50:38 -05:00
buffyuwu
b5b4e87e51 Update lavaland.dmm 2021-02-07 12:43:50 -05:00
buffyuwu
07d7a36c3e phoron fix 2021-02-07 12:19:08 -05:00
buffyuwu
0dfa96ea71 Merge branch 'master' into lavaland 2021-02-07 02:20:40 -05:00
buffyuwu
bad8d7ab18 Merge branch 'master' into lavaland 2021-02-07 01:23:04 -05:00
buffyuwu
bba5f2e071 tgs machine go brr 2021-02-07 01:21:25 -05:00
buffyuwu
29bcaafbf0 Merge branch 'master' into gaiasounds 2021-02-07 01:09:44 -05:00
silicons
9601ec14b8 Merge pull request #2674 from Captain277/Final-Freeze-Fixes
Shuttle Engines Now Use Fuel and Eleven Other Things
2021-02-06 22:48:38 -07:00