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

1456 Commits

Author SHA1 Message Date
LetterJay
b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -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
e0f65beb37 World > SSticker 2017-05-22 12:31:05 -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
LetterJay
d200bff9f4 spaces. spaces caused the file to conflict. 2017-05-22 11:26:47 -05:00
LetterJay
73dea85b15 commit/rej cleanup 2017-05-22 11:24:17 -05:00
LetterJay
1d8f9b31ee Merge pull request #1095 from Citadel-Station-13/upstream-merge-27466 
[MIRROR] Fixes talisman grammar
 2017-05-22 08:25:42 -05:00
LetterJay
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
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
LetterJay
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
LetterJay
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
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
CitadelStationBot
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
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
3ad9c0ffed fixes cults being able to delete people (#1077) 2017-05-21 12:47:10 -07:00
CitadelStationBot
c0da458c92 Ports folders to Initialize (#1058) 2017-05-21 01:22:53 -05:00
Poojawa
2be5022536 Merge branch 'master' into upstream-merge-27268 2017-05-21 01:22:16 -05:00
Poojawa
909be8c8c7 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344 2017-05-21 01:10:53 -05:00
CitadelStationBot
c8e9e34d2b [MIRROR] Fixes stat gathering (#1025) 
* Fixes stat gathering

* Delete blackbox.dm.rej

* Update blackbox.dm
 2017-05-21 01:07:14 -05:00
Poojawa
7a3fb9e62e update ticker.dm 2017-05-21 01:05:10 -05:00
Poojawa
110de7902e Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 01:01:11 -05:00
Poojawa
a8fa82b7c6 update world.dm 2017-05-21 01:01:10 -05:00
CitadelStationBot
883c5e034d Fixes bootstrapping the feedback database (#1012) 2017-05-21 00:46:44 -05:00
CitadelStationBot
63c64a00f1 [MIRROR] >mysql (#987) 
* >mysql

* Update dbcore.dm

* Delete dbcore.dm.rej
 2017-05-21 00:46:24 -05:00
Poojawa
d8299bdcfd delete .rej 2017-05-21 00:45:55 -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
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
Poojawa
e28130f70c Update rune_spawn_action.dm 2017-05-21 00:23:00 -05:00