shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,048 Commits 5 Branches 0 Tags
f900f2ea9a3ada8f4905e130dae1476f59a053ae
Commit Graph
8048 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub f900f2ea9a Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864 
[MIRROR] Makes thermite a component
 2017-10-29 04:23:16 -04:00
LetterJayandGitHub d182acae7f Merge pull request #3659 from Citadel-Station-13/upstream-merge-31723 
[MIRROR] Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds
 2017-10-29 04:22:03 -04:00
LetterJayandGitHub 324da0d915 Merge pull request #3657 from Citadel-Station-13/upstream-merge-32066 
[MIRROR] build_appearance_list no longer edits the list it is passed
 2017-10-29 04:20:56 -04:00
LetterJayandGitHub 077e2a1598 Merge pull request #3655 from Citadel-Station-13/upstream-merge-32112 
[MIRROR] "Mummies" (cloth golems) for Halloween
 2017-10-29 04:20:28 -04:00
LetterJayandGitHub 2503a90dc0 Merge pull request #3585 from Michiyamenotehifunana/CX-sword 
Adds fancy Energy Swords (and a toy version)
 2017-10-29 03:56:27 -04:00
LetterJayandGitHub 41eb83fb3d Merge pull request #3658 from Citadel-Station-13/upstream-merge-32127 
[MIRROR] [s] Blocks world proc calls
 2017-10-29 03:47:43 -04:00
LetterJayandGitHub 1005211741 Merge pull request #3654 from Citadel-Station-13/upstream-merge-32130 
[MIRROR] [s] Makes ImmediateInvokeAsync a world proc
 2017-10-29 03:47:12 -04:00
LetterJayandGitHub 1a292c8457 Merge pull request #3653 from Citadel-Station-13/upstream-merge-32119 
[MIRROR] Fixes round conversion issues
 2017-10-29 03:46:57 -04:00
LetterJayandGitHub fb24abfaf7 Merge pull request #3652 from Citadel-Station-13/upstream-merge-32142 
[MIRROR] Remove stray parent proc call in collector code
 2017-10-29 03:46:30 -04:00
LetterJayandGitHub 13891ec34b Merge pull request #3651 from Citadel-Station-13/upstream-merge-32107 
[MIRROR] Adds some new grindables to the grinder
 2017-10-29 03:46:19 -04:00
LetterJayandGitHub 7402fab19e Merge pull request #3650 from Citadel-Station-13/upstream-merge-32137 
[MIRROR] Remove some unneeded null checks in lighting
 2017-10-29 03:46:05 -04:00
LetterJayandGitHub 6156067cd6 Merge pull request #3645 from Citadel-Station-13/upstream-merge-32022 
[MIRROR] Find references fix.
 2017-10-29 03:45:15 -04:00
LetterJayandGitHub 5f9a76c6dd Merge pull request #3644 from Citadel-Station-13/upstream-merge-32009 
[MIRROR] Add a safety check to buildmode, also fix a bug with corner selection
 2017-10-29 03:45:06 -04:00
LetterJayandGitHub d6c143c860 Merge pull request #3643 from Citadel-Station-13/upstream-merge-32121 
[MIRROR] Fixes motion cameras runtiming when a target is deleted before they are detected to be  leaving the range/dead.
 2017-10-29 03:44:55 -04:00
LetterJayandGitHub c62f6ec353 Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093 
[MIRROR] Roundstart species pref fixes/removes redundant species config
 2017-10-29 03:41:59 -04:00
LetterJayandGitHub a595bee5af Update preferences.dm 2017-10-29 01:58:33 -05:00
LetterJayandGitHub 95023664dd Update preferences.dm 2017-10-29 01:53:35 -05:00
LetterJayandGitHub 74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051 
[MIRROR] More radiation balance changes and fixes
 2017-10-29 02:41:44 -04:00
LetterJayandGitHub f77b66ebb9 Update preferences.dm 2017-10-29 01:40:28 -05:00
LetterJayandGitHub 341c2e748b Merge pull request #3636 from Citadel-Station-13/upstream-merge-32100 
[MIRROR] Fixes supermatter tongs not updating icon if the sliver is dropped
 2017-10-29 02:28:04 -04:00
LetterJayandGitHub bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJayandGitHub 6b9d315673 Merge pull request #3631 from Citadel-Station-13/upstream-merge-32096 
[MIRROR] Vampire species for halloween
 2017-10-29 02:11:56 -04:00
LetterJayandGitHub d24e4f2d84 Update game_options.dm 2017-10-29 00:59:20 -05:00
LetterJayandGitHub 3b91f4efcc Merge branch 'master' into upstream-merge-32096 2017-10-29 01:49:22 -04:00
LetterJayandGitHub 71dd5e8e2e Update game_options.dm 2017-10-29 00:48:50 -05:00
LetterJayandGitHub debaad2948 Update podpeople.dm 2017-10-29 00:47:47 -05:00
LetterJayandGitHub d4e794eef7 Update furrypeople.dm 2017-10-29 00:47:25 -05:00
LetterJayandGitHub 180e730be9 Update species.dm 2017-10-29 00:46:15 -05:00
LetterJayandGitHub 78da30ec8d Update species.dm 2017-10-29 00:25:17 -05:00
CitadelStationBot 6a5b3b278e Automatic changelog generation for PR #3524 [ci skip] 2017-10-28 23:42:38 -05:00
LetterJayandGitHub f555403d7f Merge pull request #3524 from Citadel-Station-13/upstream-merge-31877 
[MIRROR] Allows species to be blocked from ever being roundstart, can now choose your Halloween species
 2017-10-29 00:42:37 -04:00
LetterJayandGitHub e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
CitadelStationBotandkevinz000 1265e804c5 [MIRROR] Adds a method to transfer all components from one datum to another (#3661) 
* Merge pull request #31941 from tgstation/Cyberboss-patch-2

Adds a method to transfer all components from one datum to another

* Adds a method to transfer all components from one datum to another
 2017-10-28 01:19:48 -07:00
CitadelStationBot 99e4db7bf4 Automatic changelog generation for PR #3663 [ci skip] 2017-10-28 03:19:40 -05:00
CitadelStationBotandkevinz000 4e4634649e [MIRROR] [Review Again] Updates the cloning manual (#3663) 
* [Review Again] Updates the cloning manual

* Update manuals.dm
 2017-10-28 01:19:38 -07:00
LetterJayandGitHub c64446962d Merge branch 'master' into upstream-merge-32096 2017-10-28 03:47:08 -04:00
LetterJayandGitHub 32c8ee16c8 Merge pull request #3666 from Citadel-Station-13/updatefordays 
Adds the roundstart races to game_options
 2017-10-28 03:43:55 -04:00
LetterJay 6e17d42c33 updating the roundstart config for ref on master 2017-10-28 02:24:26 -05:00
LetterJayandGitHub a221d3505f Update DNA.dm 2017-10-28 02:19:08 -05:00
LetterJayandGitHub 6172cd38bd Merge pull request #3628 from Citadel-Station-13/upstream-merge-32087 
[MIRROR] Halloween Tweaks
 2017-10-28 03:16:43 -04:00
LetterJayandGitHub 81abe4f1e2 Merge pull request #3627 from Citadel-Station-13/upstream-merge-32050 
[MIRROR] Use phpenv for the php build in travis instead of a PPA
 2017-10-28 03:16:26 -04:00
LetterJayandGitHub 1eecc529c0 Merge pull request #3424 from Citadel-Station-13/upstream-merge-31737 
[MIRROR] Adds defines for organ slots
 2017-10-28 02:32:26 -04:00
LetterJayandGitHub 0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
LetterJay 79d6f42dfd conflicts 2017-10-28 01:16:26 -05:00
LetterJayandGitHub 5dbcbf5689 Update podpeople.dm 2017-10-28 00:23:30 -05:00
LetterJayandGitHub 2d8468aed0 Update _cit_helpers.dm 2017-10-28 00:23:25 -05:00
LetterJayandGitHub 6901dba147 Update tgstation.dme 2017-10-27 23:56:50 -05:00
LetterJayandGitHub 985fdcd22d Update clown_items.dm 2017-10-27 23:56:37 -05:00
LetterJayandGitHub 08153b0fbb Update misc.dm 2017-10-27 23:56:13 -05:00
LetterJayandGitHub 12fa1e3ece Update preferences_savefile.dm 2017-10-27 23:54:51 -05:00