shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,222 Commits 5 Branches 0 Tags
f248685db25f2fb800649c5d01a19706effaea2d
Commit Graph
16222 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub f248685db2 Merge pull request #6607 from Citadel-Station-13/upstream-merge-37579 
[MIRROR] Fix placing boxes in storage implants
 2018-05-02 01:29:41 +00:00
deathride58andGitHub 084f2ac1da Merge pull request #6606 from Citadel-Station-13/upstream-merge-37593 
[MIRROR] Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
 2018-05-02 01:29:15 +00:00
deathride58andGitHub 5f6673ca4d Merge pull request #6605 from Citadel-Station-13/upstream-merge-37570 
[MIRROR] Fixes mapping issue on deltastation
 2018-05-02 01:28:34 +00:00
deathride58andGitHub a4b48cdc53 Merge pull request #6604 from Citadel-Station-13/upstream-merge-37562 
[MIRROR] Fix runtimes in corpse code due to mob_spawners becoming null
 2018-05-02 01:28:05 +00:00
deathride58andGitHub 2b8e734488 Merge pull request #6603 from Citadel-Station-13/upstream-merge-37560 
[MIRROR] Fix mecha maintenance protocol button always saying Initiate
 2018-05-02 01:27:51 +00:00
deathride58andGitHub f49c9d7e3d Merge pull request #6602 from Citadel-Station-13/upstream-merge-37561 
[MIRROR] Fixes loading custom aways.
 2018-05-02 01:27:26 +00:00
deathride58andGitHub fa5db57b56 Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568 
[MIRROR] Removes enriched uranium
 2018-05-02 01:26:27 +00:00
deathride58andGitHub 2760c61720 Merge pull request #6599 from Citadel-Station-13/upstream-merge-37572 
[MIRROR] Fixes the intergalactic stock market crash by removing the speculation/performance modifier
 2018-05-02 01:26:05 +00:00
deathride58andGitHub 8f00bca017 Merge pull request #6598 from Citadel-Station-13/upstream-merge-37477 
[MIRROR] Makes dizziness work again
 2018-05-02 01:25:46 +00:00
deathride58andGitHub 9c1a4303f9 Merge pull request #6597 from Citadel-Station-13/upstream-merge-37510 
[MIRROR] Circuits can't throw themselves
 2018-05-02 01:25:23 +00:00
deathride58andGitHub d26ba53e91 Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513 
[MIRROR] Adds traits for a character's preference towards pineapples.
 2018-05-02 01:25:04 +00:00
deathride58andGitHub ea5725cc4e Merge pull request #6595 from Citadel-Station-13/upstream-merge-37549 
[MIRROR] Resolved var name conflict for bounce_away()
 2018-05-02 01:24:36 +00:00
deathride58andGitHub 7d01eeeb35 Merge pull request #6593 from Citadel-Station-13/upstream-merge-37556 
[MIRROR] More holosigns for techwebs
 2018-05-02 01:23:19 +00:00
deathride58andGitHub dca50e5d35 Merge pull request #6575 from Citadel-Station-13/upstream-merge-37349 
[MIRROR] Adds fly and moth categories to limb grower
 2018-05-02 01:21:37 +00:00
deathride58andGitHub 4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501 
[MIRROR] Fixes missing icons
 2018-05-02 01:19:58 +00:00
deathride58andGitHub 9c41fd5516 Merge pull request #6566 from Citadel-Station-13/upstream-merge-37528 
[MIRROR] Sprite reorganizing, minor sprite fix for mineral stacks
 2018-05-02 01:19:11 +00:00
deathride58andGitHub 97ad0f39a7 Merge pull request #6552 from Citadel-Station-13/upstream-merge-37081 
[MIRROR] adds new changeling var that counts actual absorbs, uses it for Spiders ability
 2018-05-02 01:17:58 +00:00
deathride58andGitHub e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 
[MIRROR] NTNet improvements!
 2018-05-02 01:17:10 +00:00
deathride58andGitHub e8f4602716 Update implant.dm 2018-05-01 21:16:05 -04:00
Tad HardestyandCitadelStationBot 34321883cc Fix placing boxes in storage implants 2018-05-01 07:30:07 -05:00
LetterJayandGitHub 7add247144 Merge pull request #6592 from Citadel-Station-13/upstream-merge-37554 
[MIRROR] Adds some more reagents to clogged vents
 2018-04-30 22:37:37 -05:00
LetterJayandGitHub 154ab5022b Merge pull request #6576 from Citadel-Station-13/upstream-merge-37564 
[MIRROR] Actually links mineral sprites with their new location
 2018-04-30 22:34:53 -05:00
CitadelStationBot 54afa1f3e0 Revert "fixes a pacifism kill through crushing firelocks! (#37511)" 2018-04-30 21:20:43 -05:00
Jordan BrownandCitadelStationBot a3ca01f158 Merge pull request #37593 from optimumtact/revertarmshit 
Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
 2018-04-30 21:20:43 -05:00
CitadelStationBot 7e031ea0b4 Fixes mapping issue on deltastation 2018-04-30 21:20:35 -05:00
Jordan BrownandCitadelStationBot 8dd48870c1 Merge pull request #37570 from BuffEngineering/WestSolars 
Fixes mapping issue on deltastation
 2018-04-30 21:20:34 -05:00
CitadelStationBot fd136628c7 Fix runtimes in corpse code due to mob_spawners becoming null 2018-04-30 21:19:22 -05:00
Jordan BrownandCitadelStationBot d9c368a2a4 Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes 
Fix runtimes in corpse code due to mob_spawners becoming null
 2018-04-30 21:19:22 -05:00
CitadelStationBot 9127702237 Fix mecha maintenance protocol button always saying Initiate 2018-04-30 21:19:14 -05:00
Jordan BrownandCitadelStationBot 63e03413b2 Merge pull request #37560 from AutomaticFrenzy/patch/terminate-maintenace-protocols 
Fix mecha maintenance protocol button always saying Initiate
 2018-04-30 21:19:14 -05:00
CitadelStationBot 357efecee0 Fixes loading custom aways. 2018-04-30 21:19:05 -05:00
Jordan BrownandCitadelStationBot da2ea729ee Merge pull request #37561 from AnturK/customloadingfix 
Fixes loading custom aways.
 2018-04-30 21:19:05 -05:00
CitadelStationBot 9a27c8568f Removes enriched uranium 2018-04-30 21:15:35 -05:00
Jordan BrownandCitadelStationBot c4d461f3be Merge pull request #37568 from pigeonsk/removeenruranium 
Removes enriched uranium
 2018-04-30 21:15:35 -05:00
CitadelStationBot 02412ca7d7 Fixes the intergalactic stock market crash by removing the speculation/performance modifier 2018-04-30 21:14:22 -05:00
Jordan BrownandCitadelStationBot c869ad12bd Merge pull request #37572 from deathride58/fixesdepression 
Fixes the intergalactic stock market crash by removing the speculation/performance modifier
 2018-04-30 21:14:22 -05:00
CitadelStationBot 6f6cd9b92a Makes dizziness work again 2018-04-30 13:38:13 -05:00
AlomgaandCitadelStationBot 90ecbf6bb9 Makes dizziness work again 2018-04-30 13:38:12 -05:00
CitadelStationBot 9b6c3f5da2 Circuits can't throw themselves 2018-04-30 13:04:20 -05:00
Jordan BrownandCitadelStationBot 9c9b2feefc Merge pull request #37510 from JJRcop/throw_myself 
Circuits can't throw themselves
 2018-04-30 13:04:19 -05:00
CitadelStationBot 43d29006dc Adds traits for a character's preference towards pineapples. 2018-04-30 13:02:05 -05:00
Jordan BrownandCitadelStationBot 12eb6a8a97 Merge pull request #37513 from ShizCalev/pineapple-memes 
Adds traits for a character's preference towards pineapples.
 2018-04-30 13:02:05 -05:00
CitadelStationBot 1ed2c6cddf Resolved var name conflict for bounce_away() 2018-04-30 12:51:40 -05:00
Jordan BrownandCitadelStationBot a9d452a24d Merge pull request #37549 from ShizCalev/bounce_away-fixes 
Resolved var name conflict for bounce_away()
 2018-04-30 12:51:40 -05:00
CitadelStationBot 22ec020158 More holosigns for techwebs 2018-04-30 12:48:12 -05:00
Jordan BrownandCitadelStationBot bf0fe93f35 Merge pull request #37556 from 81Denton/techweb-sunglasses 
More holosigns for techwebs
 2018-04-30 12:48:12 -05:00
CitadelStationBot 15e82029ef Adds some more reagents to clogged vents 2018-04-30 12:46:59 -05:00
Jordan BrownandCitadelStationBot 8f1bb462ad Merge pull request #37554 from DaxDupont/vents 
Adds some more reagents to clogged vents
 2018-04-30 12:46:58 -05:00
LetterJayandGitHub 7205a15ef7 Merge pull request #6591 from Citadel-Station-13/upstream-merge-37577 
[MIRROR] Removes a duplicate comsig I accidently added
 2018-04-30 11:06:19 -05:00
LetterJayandGitHub 94bebc33a0 Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494 
[MIRROR] [s] Small tweaks and fixes a edgecase with machine construction
 2018-04-30 11:03:33 -05:00