Commit Graph
4755 Commits
Author SHA1 Message Date
CitadelStationBotandPoojawa e353091c47 [MIRROR] Fixes shield blobs not blocking atmos (#2575)
* Fixes shield blobs not blocking atmos

* atmosia blocking
2017-09-04 02:47:09 -05:00
CitadelStationBotandPoojawa 2ab11de906 [MIRROR] Removes a Redundant Check (#2572)
* Removes a Redundant Check

* Removes redundant check
2017-09-04 02:41:41 -05:00
CitadelStationBot e4101c8f6c Automatic changelog generation for PR #2568 [ci skip] 2017-09-04 02:41:17 -05:00
CitadelStationBotandPoojawa ad43c951b8 [MIRROR] Slime people can eat anything again (#2568)
* Slime people can eat anything again

* slimes can eat. Furry food prefs
2017-09-04 02:41:15 -05:00
kevinz000andPoojawa c00d7aa3f6 Update ears.dm (#2489) 2017-09-04 02:39:20 -05:00
CitadelStationBot dccffe6e74 Automatic changelog generation for PR #2559 [ci skip] 2017-09-04 01:36:01 -05:00
CitadelStationBotandPoojawa 9b00f12ba0 Makes the shuttle code a little bit more robust by removing a snowflake loop (#2559) 2017-09-04 01:36:00 -05:00
CitadelStationBotandkevinz000 e7a6c2d09f [MIRROR] Fixes anti-drop exploit (#2589)
* Fixes anti-drop exploit

* Update augments_internal.dm
2017-09-03 14:59:30 -07:00
CitadelStationBot 12dffed71d Automatic changelog generation for PR #2588 [ci skip] 2017-09-03 11:54:04 -05:00
LetterJayandGitHub b944b8b7c4 Merge pull request #2588 from Citadel-Station-13/GuilmonFixRedux
really fixes guilmons this time
2017-09-03 11:54:03 -05:00
LetterJay e0eeda1f63 really fixes guilmons this time 2017-09-03 11:37:15 -05:00
CitadelStationBot ac1d6080c9 Fix the mirror script 2017-09-03 10:54:11 -05:00
CitadelStationBot 6547c77ed6 Fixed the mirror script 2017-09-03 06:20:21 -05:00
LetterJay 92b7af7e14 commit 2017-09-02 23:39:20 -05:00
LetterJayandGitHub 9c857576b4 Merge pull request #2581 from Citadel-Station-13/ItemAddition
Everyone now spawns with pulserifles
2017-09-02 07:59:09 -05:00
LetterJayandGitHub 0947177b6e Update tgstation.dme 2017-09-02 07:58:53 -05:00
CitadelStationBot 5e75fc6f27 Automatic changelog generation for PR #2442 [ci skip] 2017-09-02 07:49:04 -05:00
LetterJayandGitHub 8aa7dbdbb6 Merge pull request #2442 from Citadel-Station-13/upstream-merge-29105
[MIRROR] Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
2017-09-02 07:49:03 -05:00
LetterJayandGitHub 28b64099a7 Delete cebusoap.dmi 2017-09-02 07:48:32 -05:00
LetterJay f8413517bb testing 2017-09-02 07:43:34 -05:00
LetterJayandGitHub 7aa042cff1 Update randomverbs.dm 2017-09-02 07:33:45 -05:00
LetterJayandGitHub 7711b73ca7 Update randomverbs.dm 2017-09-02 07:31:52 -05:00
LetterJayandGitHub a94ffca643 Update admin.dm 2017-09-02 07:28:33 -05:00
LetterJayandGitHub f4b08d32a7 Update admin.dm 2017-09-02 07:26:16 -05:00
LetterJayandGitHub 3e0ead1204 Merge branch 'master' into upstream-merge-29105 2017-09-02 07:11:32 -05:00
LetterJayandGitHub 8731fb7e1c Delete database_changelog.txt.rej 2017-09-02 07:07:39 -05:00
LetterJay 2bfc7872fa cleanup 2017-09-02 07:06:37 -05:00
LetterJayandGitHub 31e3f6135a Update tgstation_schema.sql 2017-09-02 07:01:05 -05:00
LetterJayandGitHub ea0f489f95 Update tgstation_schema_prefixed.sql 2017-09-02 07:01:01 -05:00
LetterJayandGitHub 2161084ba1 Update database_changelog.txt 2017-09-02 06:59:47 -05:00
LetterJayandGitHub 8f7368bc57 Update config.txt 2017-09-02 06:58:30 -05:00
LetterJayandGitHub fed956efec Update job_exp.dm 2017-09-02 06:56:35 -05:00
LetterJayandGitHub 74307f2858 Update preferences.dm 2017-09-02 06:55:52 -05:00
LetterJayandGitHub 7fea74994f Update randomverbs.dm 2017-09-02 06:53:49 -05:00
LetterJayandGitHub 88b452595f Update antag_spawner.dm 2017-09-02 06:52:03 -05:00
LetterJayandGitHub 7617164617 Update blackbox.dm 2017-09-02 06:50:35 -05:00
LetterJayandGitHub 4a1bb5addb Update configuration.dm 2017-09-02 06:49:21 -05:00
LetterJayandGitHub 7734469152 Merge pull request #2580 from Citadel-Station-13/MirrorF
Manual Mirror of missed PRs
2017-09-02 06:01:16 -05:00
LetterJay 78ed8f0913 Fixes mecha drill not working on windoors. 2017-09-02 05:35:36 -05:00
LetterJay d8679dbfcf Prevents hallucinations revealing people's identity 2017-09-02 05:33:55 -05:00
LetterJay 5d1c2c523b Fixes no drop implant 2017-09-02 05:31:15 -05:00
LetterJay e310435892 UI objects should PIXEL_SCALE 2017-09-02 05:26:22 -05:00
LetterJay 96c790a81f Unruntimes fdel on savefiles 2017-09-02 05:23:35 -05:00
LetterJayandGitHub b1302230c0 Merge pull request #2560 from Citadel-Station-13/upstream-merge-30121
[MIRROR] Converts npc saves to jsons
2017-09-02 05:20:31 -05:00
LetterJayandGitHub 29f0e2edd4 Rename toolsmerge-upstream-pull-request.sh to merge-upstream-pull-request.sh 2017-09-01 22:31:16 -05:00
kevinz000andGitHub 0d36f6dd47 Update toolsmerge-upstream-pull-request.sh (#2579) 2017-09-01 19:02:13 -07:00
LetterJayandGitHub fafc1b2d14 Merge pull request #965 from Citadel-Station-13/custom_roundstart_items
Custom Roundstart Items
2017-09-01 11:41:12 -05:00
LetterJayandGitHub 98da910178 Update read_from_file.dm 2017-09-01 11:21:50 -05:00
CitadelStationBot 430833c462 Automatic changelog generation for PR #2578 [ci skip] 2017-09-01 10:29:57 -05:00
LetterJayandGitHub 07e65fac7c Merge pull request #2578 from Citadel-Station-13/upstream-merge-30102
[MIRROR] Various Ninja Fixes
2017-09-01 10:29:55 -05:00