CitadelStationBot
|
efa9de6da9
|
Area Refactor + Var-edit Cleanup
|
2017-05-22 22:08:35 -05:00 |
|
LetterJay
|
e675b3becc
|
var/mine_range
|
2017-05-22 17:35:40 -05:00 |
|
LetterJay
|
288c072544
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27474
|
2017-05-22 17:30:31 -05:00 |
|
LetterJay
|
b66b362e4f
|
Merge pull request #1109 from Citadel-Station-13/upstream-merge-27484
[MIRROR] KA Pressure Mods are now a traitor miner item
|
2017-05-22 17:25:47 -05:00 |
|
LetterJay
|
e178fb4ac6
|
Merge pull request #1111 from Citadel-Station-13/upstream-merge-27500
[MIRROR] Adds extra investigate logs for SM
|
2017-05-22 17:23:18 -05:00 |
|
LetterJay
|
25c1aa40dd
|
Merge pull request #1079 from Citadel-Station-13/upstream-merge-27450
[MIRROR] Removes the mess added with recalling with a message
|
2017-05-22 17:14:14 -05:00 |
|
LetterJay
|
cbae09b538
|
rej cleanup/commit
|
2017-05-22 16:59:39 -05:00 |
|
LetterJay
|
aad357bd74
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27450
|
2017-05-22 16:56:18 -05:00 |
|
LetterJay
|
abbacd2c89
|
Merge branch 'master' into upstream-merge-27160
|
2017-05-22 16:29:43 -05:00 |
|
LetterJay
|
ab50a3eca5
|
Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283
[MIRROR] Decentralized and Vastly Improved Gang Influence System
|
2017-05-22 16:28:57 -05:00 |
|
LetterJay
|
c414bcd26e
|
Update equipment.dm
|
2017-05-22 13:13:16 -05:00 |
|
LetterJay
|
3f62929340
|
Merge branch 'master' into upstream-merge-27379
|
2017-05-22 12:45:18 -05:00 |
|
LetterJay
|
9df8057e0e
|
Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
|
2017-05-22 12:40:18 -05:00 |
|
LetterJay
|
8791ad036f
|
Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268
[MIRROR] World.dm Refactor
|
2017-05-22 12:39:52 -05:00 |
|
LetterJay
|
3548ed5e3e
|
i'll fix this in another PR
|
2017-05-22 12:27:59 -05:00 |
|
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 |
|
CitadelStationBot
|
84e30c6824
|
Adds extra investigate logs for SM
|
2017-05-22 11:36:40 -05:00 |
|
LetterJay
|
73dea85b15
|
commit/rej cleanup
|
2017-05-22 11:24:17 -05:00 |
|
CitadelStationBot
|
4533d31e34
|
Cult Fixes for Construct Icons and Spells
|
2017-05-22 10:49:33 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
ef69582c52
|
Merge pull request #1090 from Citadel-Station-13/upstream-merge-27472
[MIRROR] Minor Grammar Fixes
|
2017-05-22 08:24:41 -05:00 |
|
LetterJay
|
a345c41bcd
|
Merge pull request #1089 from Citadel-Station-13/upstream-merge-27473
[MIRROR] Nerfs monkeys
|
2017-05-22 08:24:26 -05:00 |
|
LetterJay
|
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
|
9e2d43fd80
|
KA Pressure Mods are now a traitor miner item
|
2017-05-22 08:20:07 -05:00 |
|
CitadelStationBot
|
ebca1eb051
|
A silicon will always be able to speak Galactic Common
|
2017-05-22 07:26:31 -05:00 |
|
CitadelStationBot
|
25df88509a
|
Reorganizes martial arts and stores them in the MIND.
|
2017-05-22 07:13:10 -05:00 |
|
CitadelStationBot
|
2617011eb5
|
Having less legs won't slow you down if you're in zero gravity with a jetpack
|
2017-05-22 07:08:59 -05:00 |
|
CitadelStationBot
|
73aa9346e3
|
Fixes built air meters not working
|
2017-05-21 22:29:15 -05:00 |
|
CitadelStationBot
|
8bc4cf3f41
|
Warden Compact Combat Shotgun
|
2017-05-21 22:29:01 -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
|
8abbf12132
|
Resonator fields now visually show how long they have until they burst
|
2017-05-21 22:28:36 -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
|
d7f0b9494b
|
Ports pandemic to tgui
|
2017-05-21 22:28:16 -05:00 |
|
CitadelStationBot
|
f43a861d6e
|
Plasma cutters will mine further but will go less distance in open air
|
2017-05-21 22:27:50 -05:00 |
|
CitadelStationBot
|
a33966b231
|
Fixes paper runtimes
|
2017-05-21 22:27:46 -05:00 |
|
CitadelStationBot
|
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 |
|
kevinz000
|
7e2cebe1db
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-21 17:50:29 -07:00 |
|
CitadelStationBot
|
0924db6d41
|
Re-removes "the station" from drone law 3 (#1075)
|
2017-05-21 17:45:06 -07:00 |
|
CitadelStationBot
|
cd82124ef5
|
Survival pod doors will properly turn if on shuttles (#1070)
|
2017-05-21 17:43:53 -07:00 |
|
CitadelStationBot
|
a3807448db
|
Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#1076)
|
2017-05-21 17:42:06 -07:00 |
|
CitadelStationBot
|
26448d7016
|
Removes the mess added with recalling with a message
|
2017-05-21 07:57:17 -05:00 |
|
CitadelStationBot
|
e224a47f53
|
Two more types of Legion and makes environment_smash levels into defines
|
2017-05-21 02:52:23 -05:00 |
|
CitadelStationBot
|
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 |
|
Poojawa
|
186ed2acbb
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268
|
2017-05-21 00:44:08 -05:00 |
|
CitadelStationBot
|
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
|
45ba084c6a
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-20 23:26:28 -05:00 |
|
CitadelStationBot
|
5455e28d76
|
Aux Base Fixes (#1067)
|
2017-05-20 23:20:45 -05:00 |
|