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

934 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
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
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
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
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
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
CitadelStationBot
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
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
cebutris
644a31ed98 Misc. guardian stuff (#1066) 
* beep boop

* Fixes one last inconsistency. Oops.

* punctuation
 2017-05-20 17:54:39 -07:00
CitadelStationBot
c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot
448dc20c2b Proto-kinetic crushers are significantly better 2017-05-20 12:42:11 -05:00
LetterJay
186a63ad34 Merge pull request #1057 from Citadel-Station-13/upstream-merge-27395 
[MIRROR] Fixes having more movespeed when xenos hug themselves
 2017-05-19 22:54:52 -05:00
LetterJay
a6ee50b11b Merge pull request #1059 from Citadel-Station-13/upstream-merge-27389 
[MIRROR] Fixes gravity generator admin spam
 2017-05-19 22:47:03 -05:00
LetterJay
2cb54a5d45 Merge pull request #1061 from Citadel-Station-13/upstream-merge-27398 
[MIRROR] IsAdminAdvancedProcCall returns FALSE in TESTING
 2017-05-19 22:46:52 -05:00
LetterJay
59f367cd23 Merge pull request #1060 from Citadel-Station-13/upstream-merge-27386 
[MIRROR] Pulse Weapons Sprite Update
 2017-05-19 22:46:43 -05:00
LetterJay
4d48592008 Merge pull request #1051 from cebutris/holofixes 
No More Free Parasites
 2017-05-19 22:46:30 -05:00
LetterJay
3f24fa15bf Merge pull request #1062 from Citadel-Station-13/Cryofix 
mob_occupant to occupant
 2017-05-19 22:46:14 -05:00
LetterJay
6733349b3f this didn't mirror for some reason 2017-05-19 22:43:52 -05:00
LetterJay
6d3e9f9c50 mob_occupant to occupant 2017-05-19 22:33:26 -05:00
CitadelStationBot
915fa6cac1 IsAdminAdvancedProcCall returns FALSE in TESTING 2017-05-19 16:00:23 -05:00
CitadelStationBot
461804e635 Pulse Weapons Sprite Update 2017-05-19 13:51:47 -05:00
CitadelStationBot
778d809ff3 Fixes gravity generator admin spam 2017-05-19 13:48:39 -05:00
CitadelStationBot
4430e7d0c3 Fixes having more movespeed when xenos hug themselves 2017-05-19 12:31:59 -05:00
LetterJay
7f9f226285 Merge pull request #1053 from Citadel-Station-13/upstream-merge-27385 
[MIRROR] fixes aimed spells not recharging
 2017-05-19 09:05:25 -04:00
CitadelStationBot
c36eee94bd Adds modified syringe guns 2017-05-19 06:25:23 -05:00
CitadelStationBot
45bc120501 fixes aimed spells not recharging 2017-05-19 06:21:06 -05:00
LetterJay
af815195bc Merge pull request #1034 from Citadel-Station-13/upstream-merge-27368 
[MIRROR] Fixes bane runtimes
 2017-05-19 05:32:31 -04:00