Commit Graph

2853 Commits

Author SHA1 Message Date
LetterJay
f4852314dd Merge pull request #3353 from Citadel-Station-13/upstream-merge-31588
[MIRROR] Fixes stationary mob parallax
2017-10-13 00:20:46 -04:00
LetterJay
b43a207390 Merge pull request #3349 from Citadel-Station-13/upstream-merge-31586
[MIRROR] Fixes canisters breaking multiple times
2017-10-13 00:20:38 -04:00
LetterJay
ea7b3d101d Merge pull request #3347 from Citadel-Station-13/upstream-merge-31585
[MIRROR] Fixes empty light fixtures showing as working lights in DM
2017-10-13 00:06:06 -04:00
LetterJay
b0f1ecda37 Merge pull request #3336 from Citadel-Station-13/upstream-merge-31569
[MIRROR] Fixes conveyor belt layering
2017-10-12 23:55:05 -04:00
LetterJay
25396db2df Merge pull request #3332 from Citadel-Station-13/upstream-merge-31605
[MIRROR] Fixes cryo
2017-10-12 23:45:42 -04:00
LetterJay
d02dcb496e Merge pull request #3331 from Citadel-Station-13/upstream-merge-31542
[MIRROR] makes vacuums "cold", sort of
2017-10-12 23:40:55 -04:00
LetterJay
0263f44791 Merge pull request #3330 from Citadel-Station-13/upstream-merge-31554
[MIRROR] Fix lavaland turfs looking awkward to AIs
2017-10-12 23:38:00 -04:00
LetterJay
3ee44b45f9 Merge pull request #3329 from Citadel-Station-13/upstream-merge-31556
[MIRROR] Fixes client vv not working.
2017-10-12 23:27:54 -04:00
Jordan Brown
7ef36802ff Merge pull request #31588 from ninjanomnom/shuttle-parallax
Fixes stationary mob parallax
2017-10-12 16:07:12 -05:00
YPOQ
848016ab15 Fixes canisters breaking multiple times (#31586) 2017-10-12 15:48:17 -05:00
Jordan Brown
572f3b8905 Merge pull request #31585 from ShizCalev/empty-light-editor-fix
Fixes empty light fixtures showing as working lights in DM
2017-10-12 15:27:37 -05:00
ShizCalev
f696ada7c8 Fixes conveyor belt layering (#31569) 2017-10-12 12:34:19 -05:00
Jordan Brown
763bcc59ee Merge pull request #31605 from AnturK/cryofix
Fixes cryo
2017-10-12 11:56:09 -05:00
duncathan salt
425915615b makes vacuums "cold", sort of (#31542) 2017-10-12 11:47:51 -05:00
LetterJay
06061f0870 Merge pull request #3301 from Citadel-Station-13/upstream-merge-31530
[MIRROR] Allows snoring while unconscious
2017-10-12 12:37:03 -04:00
LetterJay
dc5aeb33e6 Merge pull request #3294 from Citadel-Station-13/upstream-merge-31475
[MIRROR] Removes spawns from assembly code
2017-10-12 12:36:53 -04:00
Tad Hardesty
00606b9303 Fix lavaland turfs looking awkward to AIs (#31554) 2017-10-12 10:40:38 -05:00
Kyle Spier-Swenson
6c27182bec Fixes client vv not working. (#31556) 2017-10-12 10:39:28 -05:00
LetterJay
41846d0793 Merge branch 'master' into upstream-merge-31599 2017-10-12 11:00:37 -04:00
LetterJay
4a8f3d0e41 fuck this shit 2017-10-12 09:58:16 -05:00
LetterJay
2e503acc57 Update assembly.dm 2017-10-12 06:21:30 -05:00
LetterJay
f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
[MIRROR] Minor refactor of how gas IDs are handled
2017-10-12 07:19:30 -04:00
LetterJay
07f0a5f503 Merge pull request #3318 from Citadel-Station-13/upstream-merge-31365
[MIRROR] Mega Carp Re-Carpening: Carpatastrophe!
2017-10-12 07:18:35 -04:00
LetterJay
d82459ae45 Merge pull request #3316 from Citadel-Station-13/upstream-merge-31548
[MIRROR] Shameless Cleanbot Buff
2017-10-12 07:18:18 -04:00
LetterJay
2a5ac01177 Merge pull request #3315 from Citadel-Station-13/upstream-merge-31550
[MIRROR] Removes the ability to unweld a singletank
2017-10-12 07:18:10 -04:00
LetterJay
1e87d0d2a2 Merge pull request #3314 from Citadel-Station-13/upstream-merge-31551
[MIRROR] Added Banana Peels Inhand Sprites [Partial Fix - #30081]
2017-10-12 07:17:57 -04:00
LetterJay
fe00337475 Merge pull request #3313 from Citadel-Station-13/upstream-merge-31545
[MIRROR] Adds round ID to the banning panel
2017-10-12 07:17:34 -04:00
LetterJay
9af6ffa946 Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543
[MIRROR] Datumizes world/Topic
2017-10-12 07:16:44 -04:00
LetterJay
f19437bae9 Merge pull request #3307 from deathride58/crewobjtweaksgalore
Crew Obj & Miscreant system optimizations and tweaks
2017-10-12 07:16:13 -04:00
LetterJay
e15c337851 Merge pull request #3306 from Citadel-Station-13/upstream-merge-31449
[MIRROR] Datum antag wizard.
2017-10-12 07:15:53 -04:00
LetterJay
7b27e2d7ad Update filter.dm 2017-10-12 02:58:41 -05:00
LetterJay
301dbad665 Update life.dm 2017-10-12 02:58:02 -05:00
LetterJay
2edc2c66e9 Update vent_scrubber.dm 2017-10-12 02:57:54 -05:00
LetterJay
992416a9b4 Update carp.dm 2017-10-12 02:56:03 -05:00
LetterJay
7390bd82fd Update rightandwrong.dm 2017-10-12 02:55:28 -05:00
LetterJay
6ed7f455b7 Update modifyvariables.dm 2017-10-12 02:54:26 -05:00
duncathan salt
e61b6aecd7 unfucks filters 2017-10-12 01:07:52 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Armhulen
c269b062b9 Mega Carp Re-Carpening: Carpatastrophe! 2017-10-12 00:29:21 -05:00
Incoming5643
5711f562f0 when cleanbot cleans a tile, it will now fully cleans the tile (#31548)
As opposed to taking out one stain at a time
2017-10-12 00:29:07 -05:00
PKPenguin321
33afe4f0ca Removes unwelding a singletank (#31550)
Fixes #27341
2017-10-12 00:28:58 -05:00
Mercenaryblue
17795f04c8 Added Banana Peels Inhand Sprites (#31551)
Added in-hand Banana Peels sprites.
Default, Mime, and Bluespace.
2017-10-12 00:28:51 -05:00
Jordan Brown
976797afb3 Adds round id to the banning panel (#31545) 2017-10-12 00:28:44 -05:00
Jordan Brown
1604f8b1d3 Datumizes world/Topic (#31543)
* Datumizes world/Topic

* active_players requires comms_key
2017-10-12 00:28:27 -05:00
deathride58
bd18903e13 eh it works 2017-10-11 18:03:58 -04:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
Kyle Spier-Swenson
4c10fe270f Fixes VVing associated values in lists when the value was a number. 2017-10-10 22:17:56 -05:00
kingofkosmos
abcc74b327 Allows the snore-emote while unconscious. (#31530) 2017-10-10 22:15:33 -05:00
LetterJay
3f6596dc17 Merge pull request #3300 from Citadel-Station-13/upstream-merge-31406
[MIRROR] Adds Slappers
2017-10-10 22:34:28 -04:00
LetterJay
56f7bcddcc Merge pull request #3296 from Citadel-Station-13/upstream-merge-31443
[MIRROR] Fixes pandemic no beaker UI runtime
2017-10-10 22:33:33 -04:00