 deathride58andGitHub
|
0feca054da
|
cleans up whitespace in traitor_bro.dm
|
2017-11-21 14:58:43 -05:00 |
|
|
deathride58andGitHub
|
973be1b494
|
Update traitor_bro.dm
|
2017-11-21 14:56:41 -05:00 |
|
|
deathride58andGitHub
|
1f6b3ce629
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-21 19:53:58 +00:00 |
|
|
deathride58andGitHub
|
03d67c753e
|
Merge pull request #4056 from deathride58/MAPCONFLICTSARETHEWORST
fixes the two mapping errors introduced in #4049
|
2017-11-21 19:22:15 +00:00 |
|
|
CitadelStationBot
|
8e095c780f
|
Automatic changelog generation for PR #4052 [ci skip]
|
2017-11-21 13:15:44 -06:00 |
|
|
deathride58andGitHub
|
232be3da9f
|
Merge pull request #4052 from Citadel-Station-13/upstream-merge-32928
[MIRROR] Fixes humans missing legs moving slower in zero-g enviroments
|
2017-11-21 19:15:41 +00:00 |
|
|
deathride58
|
05800235b5
|
fixes mapping errors introduced in #4049
|
2017-11-21 13:54:20 -05:00 |
|
|
CitadelStationBot
|
e3fad3720d
|
Automatic changelog generation for PR #4050 [ci skip]
|
2017-11-21 12:19:52 -06:00 |
|
|
deathride58andGitHub
|
4c5d8529fb
|
Merge pull request #4050 from Citadel-Station-13/upstream-merge-32942
[MIRROR] Fixes computers deleting on build
|
2017-11-21 18:19:49 +00:00 |
|
|
CitadelStationBot
|
f0416d9c37
|
Fixes humans missing legs moving slower in zero-g enviroments
|
2017-11-21 04:01:56 -06:00 |
|
|
LeoandCitadelStationBot
|
f668f36156
|
Merge pull request #32928 from ShizCalev/space-leg-slowdown
Fixes humans missing legs moving slower in zero-g enviroments
|
2017-11-21 04:01:56 -06:00 |
|
|
CitadelStationBot
|
39920ff5ba
|
Fixes computers deleting on build
|
2017-11-21 02:43:34 -06:00 |
|
|
ShizCalevandCitadelStationBot
|
35af5e49aa
|
Fixes computers deleting on build (#32942)
* Fixes computers deleting on build
* Removed src
|
2017-11-21 02:43:34 -06:00 |
|
|
deathride58
|
065a816183
|
QUICK HOTFIX
|
2017-11-21 01:54:25 -05:00 |
|
|
CitadelStationBot
|
810b8a5d12
|
Automatic changelog generation for PR #4049 [ci skip]
|
2017-11-21 00:42:25 -06:00 |
|
|
deathride58andGitHub
|
c1b344f08f
|
Merge pull request #4049 from Citadel-Station-13/upstream-merge-32860
[MIRROR] Cleans up floors.dmi a bit and adds new turf decals.
|
2017-11-21 06:42:22 +00:00 |
|
|
CitadelStationBot
|
700f3f354c
|
Automatic changelog generation for PR #3639 [ci skip]
|
2017-11-20 23:53:03 -06:00 |
|
|
deathride58andGitHub
|
2e210d08e1
|
Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING
[READY] Redtext bug fix + Endround objective check cleanup
|
2017-11-21 05:53:00 +00:00 |
|
|
deathride58
|
fcac2a9fa7
|
compile
|
2017-11-21 00:40:59 -05:00 |
|
|
deathride58
|
e72399de7c
|
pain
|
2017-11-21 00:29:15 -05:00 |
|
|
deathride58
|
019b57316d
|
i want to die
|
2017-11-20 23:53:14 -05:00 |
|
|
deathride58
|
fc5badc8e3
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
|
2017-11-20 23:50:52 -05:00 |
|
|
deathride58andGitHub
|
8b5585afcf
|
Merge pull request #4045 from Citadel-Station-13/upstream-merge-32919
[MIRROR] Corrects Pubby roundstart AT issues
|
2017-11-21 04:43:04 +00:00 |
|
|
CitadelStationBot
|
d71aa73832
|
Automatic changelog generation for PR #4028 [ci skip]
|
2017-11-20 22:39:44 -06:00 |
|
|
deathride58andGitHub
|
2abd06e25e
|
Merge pull request #4028 from Citadel-Station-13/upstream-merge-32862
[MIRROR] Rat Kebabs
|
2017-11-21 04:39:41 +00:00 |
|
|
deathride58
|
0d11dfc6ef
|
COMPILE, FOUL CREATURE
|
2017-11-20 23:39:23 -05:00 |
|
|
deathride58
|
4e727ee576
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
# Conflicts:
# _maps/map_files/MetaStation/MetaStation.dmm
|
2017-11-20 23:34:46 -05:00 |
|
|
deathride58
|
f13a340eb4
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32919
# Conflicts:
# _maps/map_files/PubbyStation/PubbyStation.dmm
|
2017-11-20 23:27:31 -05:00 |
|
|
CitadelStationBot
|
7e42e7cce0
|
Automatic changelog generation for PR #4033 [ci skip]
|
2017-11-20 22:16:29 -06:00 |
|
|
deathride58andGitHub
|
11cf2365f7
|
Merge pull request #4033 from Citadel-Station-13/upstream-merge-32856
[MIRROR] Various Meta area fixes
|
2017-11-21 04:16:27 +00:00 |
|
|
deathride58andGitHub
|
d2b251d23c
|
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
[MIRROR] Cleans up unused code
|
2017-11-21 04:15:11 +00:00 |
|
|
CitadelStationBot
|
8060461cf7
|
Automatic changelog generation for PR #4032 [ci skip]
|
2017-11-20 22:15:00 -06:00 |
|
|
deathride58andGitHub
|
441806c4e8
|
Merge pull request #4032 from Citadel-Station-13/upstream-merge-32846
[MIRROR] Fixes unpowered air injectors on pubby
|
2017-11-21 04:14:58 +00:00 |
|
|
deathride58
|
d52e405912
|
hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS
|
2017-11-20 23:12:58 -05:00 |
|
|
deathride58
|
a72625b486
|
adds missing icon file
|
2017-11-20 22:56:28 -05:00 |
|
|
deathride58
|
8429bf5448
|
fixes merge conflicts
|
2017-11-20 22:53:39 -05:00 |
|
|
deathride58
|
ac2324fde8
|
fixes merge conflicts
|
2017-11-20 22:50:19 -05:00 |
|
|
deathride58
|
48adeffc57
|
Fixes merge conflict
|
2017-11-20 22:47:08 -05:00 |
|
|
CitadelStationBot
|
5e1e4ddf3f
|
Automatic changelog generation for PR #4038 [ci skip]
|
2017-11-20 21:35:51 -06:00 |
|
|
deathride58andGitHub
|
c0a6ada6d2
|
Merge pull request #4038 from Citadel-Station-13/upstream-merge-32894
[MIRROR] Fixes default green banded airlocks missing expanded click area in their sprite.
|
2017-11-21 03:35:48 +00:00 |
|
|
deathride58andGitHub
|
0ed8bf3237
|
Update security_levels.dm
|
2017-11-20 22:33:12 -05:00 |
|
|
deathride58andGitHub
|
3b0a71006c
|
Update experimentor.dm
|
2017-11-20 22:32:20 -05:00 |
|
|
deathride58andGitHub
|
15165d970d
|
Update inventory.dm
|
2017-11-20 22:29:55 -05:00 |
|
|
deathride58andGitHub
|
3aefa4a907
|
Update cameranet.dm
|
2017-11-20 22:29:15 -05:00 |
|
|
deathride58andGitHub
|
1dddcb5d83
|
Update beesease.dm
|
2017-11-20 22:28:29 -05:00 |
|
|
deathride58andGitHub
|
d09be2a59a
|
Update byjax.dm
|
2017-11-20 22:27:58 -05:00 |
|
|
CitadelStationBot
|
43faadce15
|
Automatic changelog generation for PR #4030 [ci skip]
|
2017-11-20 21:27:19 -06:00 |
|
|
deathride58andGitHub
|
6b8d256c21
|
Merge pull request #4030 from Citadel-Station-13/upstream-merge-32885
[MIRROR] tweak skateboard crashes, gives brain damage
|
2017-11-21 03:27:16 +00:00 |
|
|
deathride58andGitHub
|
b284385b20
|
Merge pull request #4042 from Citadel-Station-13/upstream-merge-32908
[MIRROR] Fixes the RD being able to kill the bar drone with his console
|
2017-11-21 03:26:26 +00:00 |
|
|
deathride58andGitHub
|
8249c89cc0
|
Merge pull request #4040 from Citadel-Station-13/upstream-merge-32905
[MIRROR] Adds AI lawset spawners (mapping helpers)
|
2017-11-21 03:25:55 +00:00 |
|