 LetterJay
|
d1db0044d1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344
|
2017-05-22 11:52:18 -05:00 |
|
|
LetterJayandGitHub
|
1d8f9b31ee
|
Merge pull request #1095 from Citadel-Station-13/upstream-merge-27466
[MIRROR] Fixes talisman grammar
|
2017-05-22 08:25:42 -05:00 |
|
|
CitadelStationBot
|
fad23e47f6
|
Automatic changelog generation for PR #1094 [ci skip]
|
2017-05-22 08:25:32 -05:00 |
|
|
LetterJayandGitHub
|
b2a0fe64af
|
Merge pull request #1094 from Citadel-Station-13/upstream-merge-27488
[MIRROR] Fixes jetpacks working indoors/in areas with gravity
|
2017-05-22 08:25:30 -05:00 |
|
|
LetterJayandGitHub
|
8572dc2da8
|
Merge pull request #1093 from Citadel-Station-13/upstream-merge-27396
[MIRROR] Since you can properly scrub Freon now, it doesn't destroy itself.
|
2017-05-22 08:25:13 -05:00 |
|
|
LetterJayandGitHub
|
ef69582c52
|
Merge pull request #1090 from Citadel-Station-13/upstream-merge-27472
[MIRROR] Minor Grammar Fixes
|
2017-05-22 08:24:41 -05:00 |
|
|
LetterJayandGitHub
|
a345c41bcd
|
Merge pull request #1089 from Citadel-Station-13/upstream-merge-27473
[MIRROR] Nerfs monkeys
|
2017-05-22 08:24:26 -05:00 |
|
|
LetterJayandGitHub
|
85e03b3e11
|
Merge pull request #1088 from Citadel-Station-13/upstream-merge-27430
[MIRROR] Fixes pkborg fields not updating location or draining power
|
2017-05-22 08:24:08 -05:00 |
|
|
CitadelStationBot
|
78b85984f8
|
Automatic changelog generation for PR #1086 [ci skip]
|
2017-05-22 08:23:25 -05:00 |
|
|
LetterJayandGitHub
|
a0e5170e40
|
Merge pull request #1086 from Citadel-Station-13/upstream-merge-27476
[MIRROR] Megafauna and lavaland mobs will no longer spawn directly on top of the mining base
|
2017-05-22 08:23:23 -05:00 |
|
|
LetterJayandGitHub
|
d016d5b669
|
Merge pull request #1085 from Citadel-Station-13/upstream-merge-27519
[MIRROR] Fixes Master/Recover not restoring previous runlevel
|
2017-05-22 08:23:05 -05:00 |
|
|
LetterJayandGitHub
|
d0cd9fc408
|
Merge pull request #1082 from Citadel-Station-13/upstream-merge-27481
[MIRROR] Fixes paper runtimes
|
2017-05-22 08:22:46 -05:00 |
|
|
CitadelStationBot
|
39635b2d0d
|
Fixes talisman grammar
|
2017-05-21 22:28:57 -05:00 |
|
|
CitadelStationBot
|
9f75c7b317
|
Fixes jetpacks working indoors/in areas with gravity
|
2017-05-21 22:28:51 -05:00 |
|
|
CitadelStationBot
|
f132720d7e
|
Since you can properly scrub Freon now, it doesn't destroy itself.
|
2017-05-21 22:28:47 -05:00 |
|
|
CitadelStationBot
|
7df5632d6e
|
Minor Grammar Fixes
|
2017-05-21 22:28:29 -05:00 |
|
|
CitadelStationBot
|
31ecd3cdd8
|
Nerfs monkeys
|
2017-05-21 22:28:25 -05:00 |
|
|
CitadelStationBot
|
1dcad5fa0e
|
Fixes pkborg fields not updating location or draining power
|
2017-05-21 22:28:20 -05:00 |
|
|
CitadelStationBot
|
4e5617ad54
|
Megafauna and lavaland mobs will no longer spawn directly on top of the mining base
|
2017-05-21 22:28:10 -05:00 |
|
|
CitadelStationBot
|
4acbd4af2c
|
Fixes Master/Recover not restoring previous runlevel
|
2017-05-21 22:27:58 -05:00 |
|
|
CitadelStationBot
|
a33966b231
|
Fixes paper runtimes
|
2017-05-21 22:27:46 -05:00 |
|
|
CitadelStationBotandkevinz000
|
5fd5e32628
|
[MIRROR] Fixes syndicate borg spawner (#1072)
* Fixes syndicate borg spawner
* Delete antag_spawner.dm.rej
* Update antag_spawner.dm
|
2017-05-21 18:30:28 -07:00 |
|
|
CitadelStationBotandkevinz000
|
312ae2218e
|
[MIRROR] fixes chameleon laser guns blowing up welding tanks for real this time (#1069)
* fixes chameleon laser guns blowing up welding tanks for real this time
* Delete energy.dm.rej
* Update energy.dm
|
2017-05-21 18:30:12 -07:00 |
|
|
kevinz000andGitHub
|
7e2cebe1db
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-21 17:50:29 -07:00 |
|
|
CitadelStationBot
|
c7de3024b1
|
Automatic changelog generation for PR #1075 [ci skip]
|
2017-05-21 19:45:08 -05:00 |
|
|
CitadelStationBotandkevinz000
|
0924db6d41
|
Re-removes "the station" from drone law 3 (#1075)
|
2017-05-21 17:45:06 -07:00 |
|
|
CitadelStationBotandkevinz000
|
cd82124ef5
|
Survival pod doors will properly turn if on shuttles (#1070)
|
2017-05-21 17:43:53 -07:00 |
|
|
CitadelStationBotandkevinz000
|
a3807448db
|
Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#1076)
|
2017-05-21 17:42:06 -07:00 |
|
|
CitadelStationBotandkevinz000
|
3ad9c0ffed
|
fixes cults being able to delete people (#1077)
|
2017-05-21 12:47:10 -07:00 |
|
|
CitadelStationBotandPoojawa
|
c0da458c92
|
Ports folders to Initialize (#1058)
|
2017-05-21 01:22:53 -05:00 |
|
|
Poojawa
|
909be8c8c7
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344
|
2017-05-21 01:10:53 -05:00 |
|
|
CitadelStationBotandPoojawa
|
c8e9e34d2b
|
[MIRROR] Fixes stat gathering (#1025)
* Fixes stat gathering
* Delete blackbox.dm.rej
* Update blackbox.dm
|
2017-05-21 01:07:14 -05:00 |
|
|
CitadelStationBotandPoojawa
|
883c5e034d
|
Fixes bootstrapping the feedback database (#1012)
|
2017-05-21 00:46:44 -05:00 |
|
|
CitadelStationBotandPoojawa
|
63c64a00f1
|
[MIRROR] >mysql (#987)
* >mysql
* Update dbcore.dm
* Delete dbcore.dm.rej
|
2017-05-21 00:46:24 -05:00 |
|
|
CitadelStationBot
|
9785b94cc5
|
Automatic changelog generation for PR #1037 [ci skip]
|
2017-05-21 00:39:27 -05:00 |
|
|
CitadelStationBotandPoojawa
|
f624071766
|
[MIRROR] Ninja Refactor (#1037)
* Ninja Refactor
* Update antagonists.dm
* Delete antagonists.dm.rej
* Update antagonists.dm
* Update mind.dm
* Update mind.dm
* whatever, I fixed that cunt
|
2017-05-21 00:39:26 -05:00 |
|
|
Poojawa
|
f4e7e152df
|
Merge branch 'upstream-merge-27344' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344
|
2017-05-21 00:37:53 -05:00 |
|
|
Poojawa
|
587bc1795c
|
missing files
|
2017-05-21 00:37:47 -05:00 |
|
|
LetterJayandGitHub
|
0b1f4a27da
|
Merge pull request #452 from Citadel-Station-13/upstream-merge-26271
[MIRROR] tgstation-server 2.0
|
2017-05-21 00:25:43 -05:00 |
|
|
PoojawaandGitHub
|
e28130f70c
|
Update rune_spawn_action.dm
|
2017-05-21 00:23:00 -05:00 |
|
|
Poojawa
|
c8e9248ebb
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344
|
2017-05-21 00:13:39 -05:00 |
|
|
CitadelStationBotandPoojawa
|
e0af0df435
|
[MIRROR] Adds Mass Insert proc to sql (#986)
* Adds Mass Insert proc to sql
* Update blackbox.dm
* Update dbcore.dm
* Delete dbcore.dm.rej
|
2017-05-20 23:43:16 -05:00 |
|
|
PoojawaandGitHub
|
45ba084c6a
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-20 23:26:28 -05:00 |
|
|
CitadelStationBot
|
64192be7a5
|
Automatic changelog generation for PR #1067 [ci skip]
|
2017-05-20 23:20:46 -05:00 |
|
|
CitadelStationBotandPoojawa
|
5455e28d76
|
Aux Base Fixes (#1067)
|
2017-05-20 23:20:45 -05:00 |
|
|
CitadelStationBotandPoojawa
|
12bbacec25
|
[MIRROR] Adds framework for cult constructs having the ability to make runes (#1010)
* Adds framework for cult constructs having the ability to make runes
* Delete mobs.dm.rej
* Update runes.dm
* clean .rej
|
2017-05-20 23:12:51 -05:00 |
|
|
CitadelStationBot
|
02492bfe2f
|
Automatic changelog generation for PR #994 [ci skip]
|
2017-05-20 23:00:03 -05:00 |
|
|
CitadelStationBotandPoojawa
|
88ede32216
|
[MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994)
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition
* Rej cleanup
* update mob.dmi
* Update living_defense.dm
|
2017-05-20 23:00:02 -05:00 |
|
|
cebutrisandkevinz000
|
644a31ed98
|
Misc. guardian stuff (#1066)
* beep boop
* Fixes one last inconsistency. Oops.
* punctuation
|
2017-05-20 17:54:39 -07:00 |
|
|
CitadelStationBotandGitHub
|
2600dfaa19
|
Merge pull request #1064 from Citadel-Station-13/upstream-merge-27436
[MIRROR] Fixes buttons under doors.
|
2017-05-20 15:05:17 -05:00 |
|