shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,078 Commits 5 Branches 0 Tags
9ddea43e0ff02c9c2ecbc180c21cd727ad42b32e
Commit Graph

959 Commits

Author SHA1 Message Date
LetterJay
1e149d1c89 Merge pull request #1119 from Citadel-Station-13/upstream-merge-27463 
[MIRROR] Auto Rifle Alt Mag Sprites
 2017-05-23 05:13:51 -05:00
LetterJay
939362fc94 Merge pull request #1120 from Citadel-Station-13/upstream-merge-27458 
[MIRROR] Adds webbing
 2017-05-23 05:13:38 -05:00
LetterJay
2fedf6b0e2 Merge pull request #1121 from Citadel-Station-13/upstream-merge-27409 
[MIRROR] Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls
 2017-05-23 05:13:18 -05:00
LetterJay
0207ab2870 Merge pull request #1124 from Citadel-Station-13/upstream-merge-27516 
[MIRROR] Fixes a probable bug/exploit that allows for fully ignoring slows
 2017-05-23 05:12:17 -05:00
LetterJay
d01d05770b Merge pull request #1125 from Citadel-Station-13/upstream-merge-27514 
[MIRROR] Fixes space movement exploit
 2017-05-23 05:11:44 -05:00
LetterJay
b38955b3a2 Merge pull request #1126 from Citadel-Station-13/upstream-merge-27512 
[MIRROR] Fixes conveyor belts moving things with no gravity
 2017-05-23 05:11:31 -05:00
CitadelStationBot
2ea155e6a7 Fixes paper bins and moves paper to initialize 2017-05-22 22:51:23 -05:00
CitadelStationBot
e382287f78 Fixes conveyor belts moving things with no gravity 2017-05-22 22:48:09 -05:00
CitadelStationBot
3c892e0f46 Fixes space movement exploit 2017-05-22 22:47:04 -05:00
CitadelStationBot
240d195e2c Fixes a probable bug/exploit that allows for fully ignoring slows 2017-05-22 22:46:59 -05:00
CitadelStationBot
6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls 2017-05-22 22:21:20 -05:00
CitadelStationBot
63dd699509 Adds webbing 2017-05-22 22:20:14 -05:00
CitadelStationBot
1d5c29b7b6 Auto Rifle Alt Mag Sprites 2017-05-22 22:16:06 -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
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
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
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