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

405 Commits

Author SHA1 Message Date
LetterJay
df34173509 Merge pull request #1301 from Citadel-Station-13/upstream-merge-27831 
[MIRROR] Fixes multi cyborgs
 2017-05-30 15:50:56 -05:00
LetterJay
f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361 
[MIRROR]  Refactors explosions
 2017-05-30 15:15:51 -05:00
LetterJay
ae22a1876a 41 files changed, original only had 4. SPACES. 2017-05-30 14:36:11 -05:00
CitadelStationBot
38b10b8c53 Fixes multi cyborgs 2017-05-30 08:52:22 -05:00
LetterJay
dba35effd5 Merge pull request #1282 from Citadel-Station-13/upstream-merge-27796 
[MIRROR] You can pet dogs again.
 2017-05-29 15:01:53 -05:00
CitadelStationBot
94fdea8866 Some pAI fixes 2017-05-29 14:42:48 -05:00
CitadelStationBot
6b01698202 You can pet dogs again. 2017-05-29 08:58:43 -05:00
LetterJay
77b4be8b3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528 2017-05-28 21:49:30 -05:00
CitadelStationBot
f42bcaf760 Finally remembers to make drakes unclickable while they're in the invulnerable stage of swooping (#1262) 2017-05-28 15:28:51 -07:00
CitadelStationBot
dec17dcfe6 Dog beds can now be renamed after new owners (#1238) 2017-05-28 15:11:06 -07:00
LetterJay
fcb3a53072 Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725 
[MIRROR] Changes incorporeal movement to use defines
 2017-05-28 14:33:22 -05:00
CitadelStationBot
4b9a7ce9cf Adds AI follow links to PDA messages and holopad speech 2017-05-28 08:14:21 -05:00
CitadelStationBot
2cc74f4a8f Changes incorporeal movement to use defines 2017-05-27 20:55:04 -05:00
CitadelStationBot
d1e38d9e1f Fixed very minor capitalization and punctuation inconsistencies. (#1104) 2017-05-27 13:43:20 -07:00
CitadelStationBot
4e381aaca4 Fixes legion icon (#1222) 2017-05-27 13:33:30 -07:00
CitadelStationBot
51dd042af5 Necropolis tendrils glow again (#1228) 2017-05-27 13:30:25 -07:00
CitadelStationBot
9288106128 Fixes monkeys having two Initializes and not returning a hint (#1188) 2017-05-27 13:29:32 -07:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
CitadelStationBot
85d474885b Brains extracted from infectious zombies keep their old species 2017-05-24 16:30:36 -05:00
LetterJay
869953cd18 Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503 
[MIRROR] Changes investigate logs to use a define
 2017-05-24 12:34:36 -05:00
LetterJay
10f5f27bf0 Merge pull request #1144 from Citadel-Station-13/upstream-merge-27554 
[MIRROR] Prevents inserted inert legion cores from healing
 2017-05-24 08:33:58 -05:00
LetterJay
006c74c6ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503 2017-05-24 08:11:07 -05:00
LetterJay
34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
CitadelStationBot
4191e1f7fd Adds the Beach Bum Language 2017-05-24 05:54:42 -05:00
CitadelStationBot
fa9785e90e Prevents inserted inert legion cores from healing 2017-05-24 00:15:13 -05:00
LetterJay
febefa0c78 Something I broke in a previous PR that I didn't see 2017-05-23 10:11:19 -05:00
LetterJay
a80a00bc6e Merge branch 'master' into upstream-merge-27324 2017-05-23 07:17:45 -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
CitadelStationBot
3c892e0f46 Fixes space movement exploit 2017-05-22 22:47:04 -05:00
CitadelStationBot
01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -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
LetterJay
abbacd2c89 Merge branch 'master' into upstream-merge-27160 2017-05-22 16:29:43 -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
4533d31e34 Cult Fixes for Construct Icons and Spells 2017-05-22 10:49:33 -05:00
CitadelStationBot
25df88509a Reorganizes martial arts and stores them in the MIND. 2017-05-22 07:13:10 -05:00
CitadelStationBot
31ecd3cdd8 Nerfs monkeys 2017-05-21 22:28:25 -05: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
e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -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
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
4d48592008 Merge pull request #1051 from cebutris/holofixes 
No More Free Parasites
 2017-05-19 22:46:30 -05:00
CitadelStationBot
4430e7d0c3 Fixes having more movespeed when xenos hug themselves 2017-05-19 12:31:59 -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
LetterJay
cda7d68cd6 Merge pull request #1031 from Citadel-Station-13/upstream-merge-27234 
[MIRROR] [READY]Peacekeeper cyborg projectile dampening fields, attempt three
 2017-05-18 23:39:25 -04:00
cebutris
893eb92833 no more free parasites 2017-05-18 18:04:42 -04:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00