shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,620 Commits 5 Branches 0 Tags
ea99c018208bec43c05a81f4f1aa70438927928e
Commit Graph
7620 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBotandPoojawa ea99c01820 [MIRROR] Fixes simple mob flying corpses (#3521) 
* Fixes simple mob flying corpses (#31794)

* makes simple mobs stop flying when they die

* Update simple_animal.dm

* Fixes simple mob flying corpses
 2017-10-21 03:46:00 -05:00
PoojawaandGitHub f993bbb6ee Fixes vore complaints with one weird trick (#3535) 2017-10-21 03:45:17 -05:00
CitadelStationBotandPoojawa 1a94726bdc [MIRROR] Fixes conflicting IDs on ruined whiteship (#3525) 
* Fixes conflicting IDs

* Fixes conflicting IDs on ruined whiteship
 2017-10-21 03:44:47 -05:00
CitadelStationBotandPoojawa 0ad6e36727 [MIRROR] Apprentice fixes (#3533) 
* Apprentice fixes (#31880)

* Fixes apprentices summoning for non-wizards

* Fixes admin antaghud not showing for solo wizards

* Apprentice fixes
 2017-10-21 03:44:21 -05:00
CitadelStationBot 139f7451da Automatic changelog generation for PR #3530 [ci skip] 2017-10-21 03:43:59 -05:00
CitadelStationBotandPoojawa fa220bcf9b [MIRROR] Cures cats of their rigor meowrtis (#3530) 
* Merge pull request #31907 from Thunder12345/no_more_rigor_meowrtis

Cures cats of their rigor meowrtis

* Cures cats of their rigor meowrtis
 2017-10-21 03:43:58 -05:00
CitadelStationBotandPoojawa c0e00ab5ca [MIRROR] [s] Fixes datum antag is_banned (#3523) 
* Fixes datum antag jobbans (#31901)

* [s] Fixes datum antag is_banned
 2017-10-20 12:48:15 -05:00
LetterJayandGitHub 655478e014 Merge pull request #3485 from Citadel-Station-13/upstream-merge-31774 
[MIRROR] reorder carbon destroy to fix ghosting
 2017-10-20 10:32:29 -04:00
CitadelStationBotandPoojawa f19665e698 [MIRROR] Fixes another stack overflow in pull code (#3515) 
* Merge pull request #31905 from AnturK/anotherloop

Fixes another stack overflow in pull code

* Fixes another stack overflow in pull code
 2017-10-20 01:42:18 -05:00
CitadelStationBotandPoojawa b044758315 [MIRROR] Fixes a parrot posession runtime (#3516) 
* Fixes a parrot posession runtime (#31879)

* Fixes a parrot posession runtime
 2017-10-20 01:41:28 -05:00
CitadelStationBot 729d9d4ab8 Automatic changelog generation for PR #3513 [ci skip] 2017-10-20 01:40:17 -05:00
CitadelStationBotandPoojawa 46a78bc3dd [MIRROR] Reverts bluespace pipes (#3513) 
* Revert bluespace pipes while keeping fixes from the original PR (#31866)

These are absurdely overpowered given that they have no research or
material gate

* Reverts bluespace pipes
 2017-10-20 01:40:15 -05:00
LetterJay bb00cb7075 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-19 09:01:55 -05:00
LetterJay b6293e7ece potential IRC fix 2017-10-19 09:01:15 -05:00
LetterJayandGitHub 72c8c8318d Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819 
[MIRROR] Fixes AI visiblity checks
 2017-10-19 09:24:28 -04:00
CitadelStationBot 22221c0638 Automatic changelog generation for PR #3506 [ci skip] 2017-10-19 08:24:06 -05:00
LetterJayandGitHub fe05d8aaaf Merge pull request #3506 from Citadel-Station-13/upstream-merge-31754 
[MIRROR] Stops manned turrets from firing when the user unbuckles themselves from the turret
 2017-10-19 09:24:04 -04:00
LetterJayandGitHub 7fce4c7bcc Merge pull request #3505 from Citadel-Station-13/upstream-merge-31778 
[MIRROR] expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode
 2017-10-19 09:23:40 -04:00
CitadelStationBot 2b4bccc952 Automatic changelog generation for PR #3504 [ci skip] 2017-10-19 08:23:10 -05:00
LetterJayandGitHub a6da3f9185 Merge pull request #3504 from Citadel-Station-13/upstream-merge-31848 
[MIRROR] Lets you press Ctrl+H (or just H in hotkey mode) to stop pulling
 2017-10-19 09:23:08 -04:00
CitadelStationBot 254fe4a194 Automatic changelog generation for PR #3503 [ci skip] 2017-10-19 08:22:27 -05:00
LetterJayandGitHub bffdbf72fb Merge pull request #3503 from Citadel-Station-13/upstream-merge-31852 
[MIRROR] You will no longer trip on inactive Honkbots. [Tweak]
 2017-10-19 09:22:26 -04:00
LetterJayandGitHub 9d967c4b09 Merge pull request #3502 from Citadel-Station-13/upstream-merge-31813 
[MIRROR] Cleans up set and adjust procs for disgust and drugginess a bit
 2017-10-19 09:21:23 -04:00
LetterJayandGitHub 33cc47d8a9 Merge pull request #3501 from Citadel-Station-13/upstream-merge-31811 
[MIRROR] Adds mapping standards to CONTRIBUTING.md
 2017-10-19 09:21:12 -04:00
CitadelStationBot d281527d55 Automatic changelog generation for PR #3499 [ci skip] 2017-10-19 08:20:04 -05:00
LetterJayandGitHub e876293476 Merge pull request #3499 from Citadel-Station-13/upstream-merge-31773 
[MIRROR] Showers clean contamination and make sound
 2017-10-19 09:20:02 -04:00
CitadelStationBot e0fc23a35e Automatic changelog generation for PR #3498 [ci skip] 2017-10-19 08:14:15 -05:00
LetterJayandGitHub a1643221aa Merge pull request #3498 from Citadel-Station-13/upstream-merge-31751 
[MIRROR] Adds radiation goggles and a small rewrite to make adding more view modes in the future easier
 2017-10-19 09:14:13 -04:00
LetterJayandGitHub 7ca5646119 Merge pull request #3497 from Citadel-Station-13/upstream-merge-31711 
[MIRROR] Removes crewpinpointer from wardens locker
 2017-10-19 09:14:00 -04:00
LetterJayandGitHub c690ee90e5 Merge pull request #3496 from Citadel-Station-13/upstream-merge-31609 
[MIRROR] Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes
 2017-10-19 09:12:26 -04:00
LetterJayandGitHub 94c6a859bf Merge pull request #3495 from Citadel-Station-13/upstream-merge-31859 
[MIRROR] Fixes an edge case in portable atmos connection check
 2017-10-19 09:11:37 -04:00
LetterJayandGitHub 0405106a27 Merge pull request #3494 from Citadel-Station-13/upstream-merge-31857 
[MIRROR] update layer manifold sprite
 2017-10-19 09:10:12 -04:00
LetterJayandGitHub 8f51e048e9 Merge pull request #3493 from Citadel-Station-13/upstream-merge-31853 
[MIRROR] fixes handbuilt gas meters
 2017-10-19 09:09:07 -04:00
LetterJayandGitHub 02f0c1573a Merge pull request #3491 from Citadel-Station-13/upstream-merge-31851 
[MIRROR] Fixes liches not blocking roundend properly.
 2017-10-19 09:08:25 -04:00
LetterJayandGitHub 6a1035b6f4 Merge pull request #3483 from Citadel-Station-13/upstream-merge-31823 
[MIRROR] Very minor refactor of gas mixture heat_capacity()
 2017-10-19 09:07:20 -04:00
CitadelStationBot 0f3a6d8390 Automatic changelog generation for PR #3482 [ci skip] 2017-10-19 08:05:20 -05:00
LetterJayandGitHub 9076721384 Merge pull request #3482 from Citadel-Station-13/upstream-merge-31842 
[MIRROR] GPS renaming fix
 2017-10-19 09:05:18 -04:00
LetterJayandGitHub 96e8196175 Merge pull request #3481 from Citadel-Station-13/upstream-merge-31839 
[MIRROR] Rewords networked fibers description
 2017-10-19 09:02:50 -04:00
LetterJayandGitHub cf73ddcdbb Merge pull request #3489 from Citadel-Station-13/upstream-merge-31847 
[MIRROR] Fixes a misnamed arg in a clockwork proc
 2017-10-19 09:02:40 -04:00
CitadelStationBot ea960345a4 Automatic changelog generation for PR #3488 [ci skip] 2017-10-19 08:02:07 -05:00
LetterJayandGitHub 2e430ec33c Merge pull request #3488 from Citadel-Station-13/upstream-merge-31814 
[MIRROR] Adds missing petbed on Meta
 2017-10-19 09:02:05 -04:00
CitadelStationBot 87d8266eb3 Automatic changelog generation for PR #3487 [ci skip] 2017-10-19 07:57:30 -05:00
LetterJayandGitHub d07b44268c Merge pull request #3487 from Citadel-Station-13/upstream-merge-31820 
[MIRROR] Humans now use the generic fire sprite if they have 3 or less firestacks
 2017-10-19 08:57:29 -04:00
CitadelStationBot 6e376e5f13 Automatic changelog generation for PR #3486 [ci skip] 2017-10-19 07:57:19 -05:00
LetterJayandGitHub b31d291ede Merge pull request #3486 from Citadel-Station-13/upstream-merge-31753 
[MIRROR] Radiation makes you vomit blood and some more balance changes
 2017-10-19 08:57:18 -04:00
CitadelStationBot 3a820f76fe Automatic changelog generation for PR #3484 [ci skip] 2017-10-19 07:56:46 -05:00
LetterJayandGitHub b8267b062e Merge pull request #3484 from Citadel-Station-13/upstream-merge-31830 
[MIRROR] Gives engi borgs geiger counters
 2017-10-19 08:56:44 -04:00
LetterJayandGitHub 626993d116 Merge pull request #3480 from Citadel-Station-13/upstream-merge-31836 
[MIRROR] Fixes recipient in pda logs
 2017-10-19 08:56:25 -04:00
LetterJay cf6caf2845 fuk 2017-10-19 07:55:48 -05:00
LetterJay de4b8ec485 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-19 07:53:43 -05:00