shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,412 Commits 5 Branches 0 Tags
dfd5c7465bbb8a166f3bf335d7dec98f8c4bb93b
Commit Graph

84 Commits

Author SHA1 Message Date
CitadelStationBot
9449004c36 Gives an initialize hint to stacks, boxes, closets and bots (#2256) 2017-08-04 08:41:04 -07:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot
76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156) 
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
 2017-08-02 03:17:32 -05:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot
5f8da9c34b Prevents the captain's sabre from rustling jimmies (#2113) 2017-07-24 04:08:41 -07:00
CitadelStationBot
c8763c994c Ore satchels no longer have infinite capacity 2017-07-21 18:20:53 -05:00
LetterJay
cff128c5d5 Merge pull request #2073 from Citadel-Station-13/upstream-merge-29180 
[MIRROR] Small belt overlay rewrite, and tool overlays for toolbelts
 2017-07-19 13:37:25 -05:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
CitadelStationBot
e6d6478482 Small belt overlay rewrite, and tool overlays for toolbelts 2017-07-19 09:30:06 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
5181326d54 [MIRROR] Adds some custom force strings and fixes a bug (#1700) 
* Adds some custom force strings and fixes a bug

* Delete clown_items.dm.rej
 2017-06-30 21:17:26 -07:00
katnep
45ce2c4caa STIMPACKS POWERCREEP EDITION (#1828) 
* STIMPACKS POWERCREEP EDITION

added stimpacks and stimpack kits to the vendor
as well as my patented powercreep kit of survival pens

* FIXING IT

Having my own file is overrated

* more fixes

Still fixing it

* FINAL FORM

Fixed it.jpeg

* FINAL FIX

THIS IS FIXING BEYOND FIXING

* GO BEYOND

* IM GONNA PUNCH IT
 2017-06-30 20:12:10 -07:00
LetterJay
e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
LetterJay
090b8b5055 Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740 
[MIRROR] Station Engineers Spawn With Industrial Welder
 2017-06-26 10:51:51 -05:00
LetterJay
b4473bedb2 Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382 
[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
 2017-06-26 05:57:59 -05:00
CitadelStationBot
d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
CitadelStationBot
0c2bf7e5ea Station Engineers Spawn With Industrial Welder 2017-06-25 09:17:52 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot
39ad327fab Fixes grenade belt and bandolier UI obscuring half the screen 2017-06-20 15:37:20 -05:00
LetterJay
52fa6e4df8 wrong way around 2017-06-19 16:25:07 -05:00
CitadelStationBot
3f92d14933 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. 2017-06-16 20:12:20 -05:00
LetterJay
ff8b2acf9e Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145 
[MIRROR] Syndicate Uplink - Typos & Grammar mk2
 2017-06-14 08:58:35 -05:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
LetterJay
55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
CitadelStationBot
4bd99124de Adds F.R.A.M.E. cartridge 2017-06-10 12:18:31 -05:00
LetterJay
700004e309 Update lockbox.dm 2017-06-10 09:24:03 -05:00
LetterJay
7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115 
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
 2017-06-10 09:01:25 -05:00
LetterJay
06be53ffeb Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049 
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
 2017-06-09 09:13:18 -05:00
CitadelStationBot
06187dd178 Syndicate Uplink - Typos & Grammar mk2 2017-06-07 14:56:22 -05:00
CitadelStationBot
9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
LetterJay
35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
LetterJay
2feab0a411 cleanup 2017-06-05 23:18:40 -05:00
CitadelStationBot
4d25a6e299 Only human and silicon servants can help recite multi-invoker scriptures 2017-06-04 19:23:18 -05:00
CitadelStationBot
bdd4f9d17f Allows explorer webbings to hold marker beacons (#1219) 2017-06-02 21:35:41 -07:00
CitadelStationBot
2c7e3ad4f7 Makes op belts less brown (#1336) 2017-06-02 21:18:26 -07:00
CitadelStationBot
6e563e7a53 Attempts to add items to a storage container beyond its slots limit will obtain a failure message again. 2017-06-02 06:42:23 -05:00
CitadelStationBot
afbfb66386 Splits mining_mobs.dm into separate files 2017-05-29 01:17:13 -05:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
LetterJay
006c74c6ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503 2017-05-24 08:11:07 -05:00
CitadelStationBot
01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00
CitadelStationBot
63dd699509 Adds webbing 2017-05-22 22:20:14 -05:00
CitadelStationBot
42e8c5dbbd fixes triple latched toolboxes spawning too often than anticipated (#1019) 2017-05-18 12:42:09 -05:00
CitadelStationBot
e6a55a4131 Adds a really stupid syndicate bible, with a great sprite by JStheguy (#1017) 2017-05-18 12:41:30 -05:00
CitadelStationBot
c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -05:00