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

195 Commits

Author SHA1 Message Date
LetterJay 67770a25be final commit(?) 2017-06-14 09:54:14 -05:00
LetterJay 28d726d1af Still need to fix the head. 2017-06-14 04:54:28 -05:00
LetterJay 226345d82a upstream-merge-28109 
upstream-merge-28352
 2017-06-13 01:10:21 -05:00
LetterJay 4624ec7e04 upstream-merge-27899 2017-06-11 00:09:55 -05:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot 9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
CitadelStationBot 9f02ba1245 Refactors another spawn cooldown var (#1393) 2017-06-04 09:04:49 -07:00
CitadelStationBot dbc902ef29 Fixes martial arts resetting on cloning. (#1338) 2017-06-02 21:21:47 -07:00
LetterJay 1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530 
[MIRROR] Area Refactor + Var-edit Cleanup
 2017-05-30 20:49:42 -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 9288106128 Fixes monkeys having two Initializes and not returning a hint (#1188) 2017-05-27 13:29:32 -07: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
CitadelStationBot 4191e1f7fd Adds the Beach Bum Language 2017-05-24 05:54:42 -05:00
LetterJay a80a00bc6e Merge branch 'master' into upstream-merge-27324 2017-05-23 07:17:45 -05:00
CitadelStationBot 01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00
CitadelStationBot efa9de6da9 Area Refactor + Var-edit Cleanup 2017-05-22 22:08:35 -05:00
CitadelStationBot 25df88509a Reorganizes martial arts and stores them in the MIND. 2017-05-22 07:13:10 -05:00
Poojawa 45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot 4430e7d0c3 Fixes having more movespeed when xenos hug themselves 2017-05-19 12:31:59 -05:00
CitadelStationBot a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot 1da5a27b98 Adjusts ear/eye protection based on missing organs (#999) 2017-05-18 12:07:33 -05:00
CitadelStationBot df9e22183d [MIRROR] Servant golems do not have special names (#939) 
* Servant golems do not have special names

* Update golems.dm
 2017-05-18 11:28:09 -05:00
CitadelStationBot 7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
CitadelStationBot c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00
CitadelStationBot 4022281599 [MIRROR] Plasma golem tweaks (#906) 
* Plasma golem tweaks

* Update golems.dm

* Delete golems.dm.rej
 2017-05-18 08:08:34 -05:00
CitadelStationBot eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot 8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
CitadelStationBot 4f971be3a9 [MIRROR] Golems do not have underclothing (#784) 
* Golems do not have underclothing

* Resolves .rej

* Update golems.dm

* Update golems.dm
 2017-05-18 03:53:14 -05:00
CitadelStationBot 257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
LetterJay 1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
LetterJay bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay ff21afdcbd Merge pull request #744 from Citadel-Station-13/upstream-merge-26828 
[MIRROR] Moves tongues to `mutanttongue` var
 2017-05-17 04:50:52 -04:00
LetterJay f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay fe62f7b737 Merge pull request #734 from Citadel-Station-13/upstream-merge-26780 
[MIRROR] Draconic language, for lizards
 2017-05-17 04:49:13 -04:00
LetterJay a3cc3087b3 warrghhlbrarrggll 2017-05-16 23:55:38 -05:00
LetterJay 45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05:00
LetterJay 485bca003f Merge pull request #640 from Citadel-Station-13/upstream-merge-26527 
[MIRROR] Zombie/limb refactors/fixes
 2017-05-13 01:24:55 -04:00
LetterJay bba7b9246d rej cleanup 2017-05-13 00:12:05 -05:00
CitadelStationBot c5ed5b84e3 Zombies can see in the dark 2017-05-12 15:57:11 -05:00
CitadelStationBot faf8829d30 [MIRROR] Adamantine golem leadership (#785) 
* Adamantine golem leadership

* Update stylesheet.dm

* Delete golems.dm.rej

* Delete stylesheet.dm.rej

* Update golems.dm

* fuck line endings
 2017-05-08 22:16:09 -07:00
CitadelStationBot 9abfbb46d4 Fixes female undershirts showing all the time (#741) 2017-05-08 16:47:35 -07:00
CitadelStationBot a6cb12b84a [MIRROR] Plastic golems (#806) 
* Plastic golems

* Update lavaland_ruin_code.dm

* Delete lavaland_ruin_code.dm.rej
 2017-05-08 00:25:20 -07:00
kevinz000 bd8bfe1327 Merge pull request #684 from Citadel-Station-13/upstream-merge-26728 
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
 2017-05-07 22:41:24 -07:00
kevinz000 6c293e3e3d Merge pull request #716 from Citadel-Station-13/upstream-merge-26768 
[MIRROR] Species-locked inventory slots are now indicated.
 2017-05-07 19:15:02 -07:00
CitadelStationBot 884338d048 Fixes being able to stand on chasms 2017-05-07 18:06:44 -05:00
LetterJay 75ca44a767 Merge pull request #827 from LetterJay/snap 
Snap Emote
 2017-05-07 15:41:32 -05:00
LetterJay 659139ca1c finger snap emote 2017-05-07 12:41:45 -05:00
kevinz000 035dd93158 Merge pull request #756 from Citadel-Station-13/upstream-merge-26848 
[MIRROR] Adds spewium toxin in traitor kits
 2017-05-06 21:43:08 -07:00
kevinz000 4a2a0e8a0d Merge pull request #732 from Citadel-Station-13/upstream-merge-26778 
[MIRROR] Plasma vessels regenerate slowly off resin
 2017-05-06 15:26:10 -07:00
CitadelStationBot 7288549dec Players may no longer commite suicide 2017-05-05 18:08:56 -05:00