Commit Graph

716 Commits

Author SHA1 Message Date
CitadelStationBot
bf4973e580 Refactor another spawn (#1394) 2017-06-04 09:04:32 -07:00
CitadelStationBot
e59e7f8d06 Fixes bsa not showing up (#1396) 2017-06-04 09:03:30 -07:00
CitadelStationBot
f8505883d4 Removes dragoontomb ruin and loot. (#1290) 2017-06-03 06:39:11 -07:00
CitadelStationBot
fa305c2aec [MIRROR] Fix NOPOWER being set incorrectly for holopads (#1300)
* Fix NOPOWER being set incorrectly for holopads

* Update hologram.dm

* Delete hologram.dm.rej
2017-06-03 06:37:30 -07:00
CitadelStationBot
043d9b478e Gives the janitor a flyswatter in their roundstart equipment (#1354) 2017-06-03 06:37:08 -07:00
CitadelStationBot
11d5262e0c Dominator colors are now directly determined by the gang's color (#1355) 2017-06-03 06:36:49 -07:00
CitadelStationBot
79ff2672b4 [MIRROR] Clean snow, lavaland, and thunderdome (#1261)
* Clean snow, lavaland, and thunderdome

* Delete mining.dm.rej
2017-06-02 22:01:46 -07:00
LetterJay
976c1244dd Config shit for cards (#1310) 2017-06-02 21:56:08 -07:00
CitadelStationBot
2dc13e6242 makes machineguns pass their users to their fire helpers instead of the floor (#1256) 2017-06-02 21:46:15 -07:00
CitadelStationBot
b85384c0ad Fixes meteor and immoveable rods hitting Centcomm (#1252) 2017-06-02 21:36:45 -07:00
CitadelStationBot
bdd4f9d17f Allows explorer webbings to hold marker beacons (#1219) 2017-06-02 21:35:41 -07:00
CitadelStationBot
2c7e3ad4f7 Makes op belts less brown (#1336) 2017-06-02 21:18:26 -07:00
CitadelStationBot
55f8700a8c Fix some camera Initializes (#1337) 2017-06-02 21:18:07 -07:00
LetterJay
7b346b6241 Merge pull request #1342 from Citadel-Station-13/upstream-merge-27932
[MIRROR] Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
2017-06-02 22:47:01 -05:00
LetterJay
c36ca8a434 Merge pull request #1344 from Citadel-Station-13/upstream-merge-27945
[MIRROR] Fixes airlocks not updating icon properly
2017-06-02 22:46:38 -05:00
LetterJay
6da343e11c Merge pull request #1346 from Citadel-Station-13/upstream-merge-27917
[MIRROR] Cult floors now reduce rune scribing for small runes by 50%
2017-06-02 22:45:56 -05:00
LetterJay
c4b280b269 Merge pull request #1323 from Citadel-Station-13/upstream-merge-27879
[MIRROR] Fixes posters
2017-06-02 22:40:28 -05:00
LetterJay
c9a1735deb Merge pull request #1318 from Citadel-Station-13/upstream-merge-27871
[MIRROR] [Meta] Var Cleanup and tweaks
2017-06-02 22:39:23 -05:00
CitadelStationBot
9a05029df6 Cult floors now reduce rune scribing for small runes by 50% 2017-06-02 16:12:43 -05:00
CitadelStationBot
b676e7b5ae Fixes airlocks not updating icon properly 2017-06-02 12:14:17 -05:00
CitadelStationBot
6e563e7a53 Attempts to add items to a storage container beyond its slots limit will obtain a failure message again. 2017-06-02 06:42:23 -05:00
CitadelStationBot
d36bc75074 Fixes posters 2017-05-31 19:29:20 -05:00
CitadelStationBot
946a6b1146 [Meta] Var Cleanup and tweaks 2017-05-31 08:57:18 -05:00
CitadelStationBot
4eb5a9bf21 Mapped active shieldgens 2017-05-31 08:56:07 -05:00
LetterJay
b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
LetterJay
fbbceadc6e Merge branch 'master' into AllMapChangesInOne 2017-05-30 23:08:32 -05:00
LetterJay
9b00499d24 It's been a long night 2017-05-30 22:41:22 -05:00
LetterJay
9ba058930e Update Space_Station_13_areas.dm 2017-05-30 22:18:02 -05:00
LetterJay
8f06db65c9 Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534
[MIRROR] Replaced mob spawner vars with outfits
2017-05-30 21:43:31 -05:00
LetterJay
1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530
[MIRROR] Area Refactor + Var-edit Cleanup
2017-05-30 20:49:42 -05:00
LetterJay
8948f2d636 FIXING SHIT. 2017-05-30 20:16:00 -05:00
LetterJay
adb7a9b6ff rej clean up
more areas
2017-05-30 20:08:53 -05:00
LetterJay
0fe4a33b15 Merge pull request #1100 from Citadel-Station-13/upstream-merge-27453
[MIRROR] [All stations] Cleaned up var-editted areas
2017-05-30 19:50:35 -05:00
LetterJay
f6f0523fa9 Merge pull request #1200 from Citadel-Station-13/upstream-merge-27661
[MIRROR] Fixes ex_act not having waitfor = FALSE
2017-05-30 18:46:40 -05:00
LetterJay
abd0e85efa Merge pull request #1197 from Citadel-Station-13/upstream-merge-27669
[MIRROR] Splits up mine_items.dm
2017-05-30 18:46:24 -05:00
LetterJay
29da073bb9 Merge pull request #1284 from Citadel-Station-13/upstream-merge-27840
[MIRROR] Fixes doubled post-round end time.
2017-05-30 18:40:54 -05:00
LetterJay
81e4f39733 Merge branch 'master' into upstream-merge-27669 2017-05-30 17:02:11 -05:00
LetterJay
976086e490 Merge branch 'master' into upstream-merge-27534 2017-05-30 16:45:59 -05:00
LetterJay
41065c4e73 waitfor 2017-05-30 16:21:24 -05:00
LetterJay
6b7dffddb2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27661 2017-05-30 16:05:53 -05:00
LetterJay
c81dc599e3 Merge pull request #1174 from Citadel-Station-13/upstream-merge-27414
[MIRROR] 4th Attempt at 60% shuttle recall gang murderbone thing
2017-05-30 16:04:41 -05:00
LetterJay
bc5ecc91b5 rej clean 2017-05-30 15:55:00 -05:00
LetterJay
cbe12313d2 Merge pull request #1306 from Citadel-Station-13/upstream-merge-27844
[MIRROR] Lavaland - Ruins now have lights
2017-05-30 15:49:40 -05:00
LetterJay
b33d26c67f Merge pull request #1307 from Citadel-Station-13/upstream-merge-27846
[MIRROR] Flamethrower fixes
2017-05-30 15:48:44 -05:00
LetterJay
f259908266 Merge pull request #1196 from Citadel-Station-13/upstream-merge-27675
[MIRROR] Fixes Gang War's infinity shuttle
2017-05-30 15:48:23 -05:00
LetterJay
377d3ffbf9 Merge pull request #1184 from Citadel-Station-13/upstream-merge-27631
[MIRROR] Turret bases will properly layer under turret covers
2017-05-30 15:47:00 -05:00
LetterJay
a38973ece8 commit 2017-05-30 15:44:41 -05:00
LetterJay
c28818b893 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27414 2017-05-30 15:29:24 -05:00
LetterJay
f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
[MIRROR]  Refactors explosions
2017-05-30 15:15:51 -05:00
CitadelStationBot
d4af5004a6 Flamethrower fixes 2017-05-30 14:55:42 -05:00