shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,828 Commits 5 Branches 0 Tags
70a2c466f3bd53977859bcafaa36cff82e04bdca
Commit Graph
675 Commits
Author SHA1 Message Date
LetterJayandGitHub a5a8f8faba Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530 
[MIRROR] Adds Gondoland and the rare Gondolas
 2017-09-12 01:21:09 -05:00
LetterJayandGitHub 1d19ee6bbf Merge pull request #2566 from Citadel-Station-13/upstream-merge-30117 
[MIRROR] Crew monitoring rework part 1: crew pinpointers
 2017-09-11 22:41:24 -05:00
LetterJayandGitHub e2f9ec4f18 Merge pull request #2686 from Citadel-Station-13/upstream-merge-30538 
[MIRROR] Uplink lock codes now pick from the phonetic alphabet global list
 2017-09-11 18:54:53 -05:00
LetterJayandGitHub 16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJayandGitHub e6cc0673aa Merge branch 'master' into upstream-merge-30399 2017-09-11 18:07:15 -05:00
LetterJayandGitHub 6cc0ea6af0 Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412 
[MIRROR] Regularizes resisting out of containers
 2017-09-11 18:05:52 -05:00
LetterJayandGitHub 74588305ce Update vending_items.dm 2017-09-11 17:50:49 -05:00
LetterJayandGitHub c42304737a Update implantchair.dm 2017-09-11 17:47:55 -05:00
KorPhaeronandCitadelStationBot 4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
LetterJayandGitHub ecdb35bb1a Merge pull request #2636 from Citadel-Station-13/upstream-merge-30396 
[MIRROR] Fixes brains counting towards highlander killstreaks
 2017-09-11 15:22:02 -05:00
LetterJayandGitHub c46c442896 Merge pull request #2635 from Citadel-Station-13/upstream-merge-30454 
[MIRROR] Gets rid of manual overlay manipulation
 2017-09-11 15:21:43 -05:00
LetterJay 80dbaae65a fuck 2017-09-11 14:37:55 -05:00
LetterJayandGitHub a05bbfc90a Update weaponry.dm 2017-09-11 14:07:11 -05:00
LetterJayandGitHub c03e216016 Update implantchair.dm 2017-09-11 14:05:58 -05:00
LetterJay 447937477e more oopsies 2017-09-11 13:50:49 -05:00
Ashe HiggsandCitadelStationBot af5ffcc83a Adds departmental banners 2017-09-11 13:37:58 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
vuonojenmustaturskaandCitadelStationBot 053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
kingofkosmosandCitadelStationBot 63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
MilitairesandCitadelStationBot 3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530) 
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
 2017-09-10 17:10:45 -05:00
ExcessiveUseOfCobblestoneandCitadelStationBot f63a75b137 Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! 2017-09-10 17:08:36 -05:00
LetterJayandGitHub e5aed03bcb all of my HATE 2017-09-10 15:20:58 -05:00
LetterJayandGitHub 50587ea679 Update tools.dm 2017-09-10 15:18:30 -05:00
LeoandCitadelStationBot 44e62d8016 Uplink lock codes now pick from the phonetic alphabet global list (#30538) 
* Uplink lock codes now pick from the phonetic alphabet global list

* Update virus_cart.dm
 2017-09-10 14:17:16 -05:00
LetterJayandGitHub 3dbfac920a Update weaponry.dm 2017-09-10 11:48:28 -05:00
LetterJayandGitHub 33f35fe4d2 Update tools.dm 2017-09-10 11:46:34 -05:00
Kerbin-FiberandCitadelStationBot d158ec9528 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter 2017-09-10 03:43:09 -05:00
ArmhulenandCitadelStationBot 0dfe72d77e chainsaws rebalance, but working this time :) 2017-09-08 10:00:47 -05:00
kingofkosmosandCitadelStationBot cf07ead653 Regularizes resisting out of containers 2017-09-08 09:58:34 -05:00
LetterJayandGitHub 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
ShizCalevandCitadelStationBot d8a3b87719 Fixes brains counting towards highlander killstreaks 2017-09-07 05:14:39 -05:00
tortellinitonyandCitadelStationBot d73b82cf11 Gets rid of manual overlay manipulation 2017-09-06 23:39:08 -05:00
deathride58 8ef2b39d44 adds clown slip objective 2017-09-06 18:34:05 -04:00
LetterJayandGitHub 24a7aa5a9f Merge branch 'master' into upstream-merge-30079 2017-09-06 09:24:23 -05:00
LetterJayandGitHub cf46abecb3 Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004 
[MIRROR] Moved emagged var to obj/item parent.
 2017-09-06 09:15:11 -05:00
PoojawaandGitHub 3ba2f650dd Adds Paradise Sofas (#2623) 
* Adds Paradise Sofas

* Actually enable them to be constructed

* Coding standards, sheesh

* am path guder
 2017-09-06 07:54:23 -05:00
LetterJay 2bfc7872fa cleanup 2017-09-02 07:06:37 -05:00
CitadelStationBot 50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00
kevinz000 f70fd6a980 Merge pull request #2536 2017-08-29 22:39:54 -07:00
kevinz000 7239a44ef1 Merge pull request #2545 2017-08-29 22:39:08 -07:00
kevinz000 7c7da67169 Merge pull request #2547 2017-08-29 22:39:03 -07:00
kevinz000 9cb65df70d Merge pull request #2426 2017-08-29 22:27:21 -07:00
kevinz000 4b32cf2e0f Merge pull request #2415 2017-08-29 22:27:15 -07:00
kevinz000 5c7b743cfa Merge pull request #2405 2017-08-29 22:27:10 -07:00
kevinz000 a0758720ce Merge branch 'master' into upstream-merge-30251 2017-08-29 22:06:28 -07:00
kevinz000 408acdd66d sync 2017-08-29 22:05:16 -07:00
kevinz000 9b71e967d2 Merge branch 'master' into upstream-merge-29964 2017-08-29 21:07:01 -07:00
kevinz000 343b508774 Merge branch 'master' into upstream-merge-30175 2017-08-29 20:14:56 -07:00
kevinz000 9572f4b298 Merge branch 'master' into upstream-merge-30098 2017-08-29 20:04:55 -07:00