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

981 Commits

Author SHA1 Message Date
CitadelStationBot
793a2ce28f Grammar and message tweaks (#1722) 2017-07-01 21:22:29 -07:00
CitadelStationBot
5f6a2a999a Chasms, asteroid turfs, basalt, and lava can no longer be made wet (#1847) 2017-07-01 21:21:24 -07:00
CitadelStationBot
73557a5e5f Fixes cardboard tube duping (#1854) 2017-07-01 21:20:39 -07:00
CitadelStationBot
c80d8af7aa [MIRROR] Makes dressers buildable (#1718) 
* Makes dressers buildable

* Delete sheet_types.dm.rej
 2017-06-30 21:26:11 -07:00
katnep
b21556329b TAUR SWEATERS and keyhole (#1827) 
by request of annoying whiners, here are sweaters in the clothes mate
have fun
 2017-06-30 21:25:17 -07:00
CitadelStationBot
8627946f72 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once (#1753) 2017-06-30 21:22:45 -07:00
CitadelStationBot
32c35a211b [MIRROR] Fixes abductors not being able to sleep people (#1692) 
* Fixes abductors not being able to sleep people

* Update abduction_gear.dm

* Delete abduction_gear.dm.rej
 2017-06-30 21:21:26 -07: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
CitadelStationBot
ca2d03a082 Moves transit space to separate z level. (#1696) 2017-06-30 20:56:45 -07:00
CitadelStationBot
fce1875d73 Observers can see through some alternate apperances (#1829) 2017-06-30 20:47:57 -07:00
CitadelStationBot
01456fddf1 Fixed small spelling + punctuation errors (#1716) 2017-06-30 20:46:40 -07:00
CitadelStationBot
57bf6fc7ba Machinery clears it's occupant var if removed (#1767) 2017-06-30 20:42:58 -07:00
CitadelStationBot
9d5e51777b use_power var now uses a define to reflect it not being a bool (#1842) 2017-06-30 20:41:59 -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
CitadelStationBot
c7d4809579 Reduces default brig times to be consistent with suggested policy. (#1609) 2017-06-28 04:07:43 -05:00
Poojawa
789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
LetterJay
196db74cbe Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588 
[MIRROR] Changes to the Atmos Watertank Backpack
 2017-06-27 22:59:32 -05: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
CitadelStationBot
6a38955803 Adds container types INJECTABLE and DRAWABLE 2017-06-27 08:19:49 -05:00
LetterJay
bb916b6040 Merge branch 'master' into upstream-merge-28681 2017-06-27 06:16:34 -05:00
LetterJay
83fead2492 Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567 
[MIRROR] Refactors PDA cartridge permissions
 2017-06-27 06:14:42 -05:00
LetterJay
f85de2ddd5 Update PDA_types.dm 2017-06-27 05:58:34 -05:00
LetterJay
2158ea1e67 Merge branch 'master' into upstream-merge-28681 2017-06-27 05:14:45 -05:00
LetterJay
8875fbefc5 Delete cart.dm.rej 2017-06-27 05:12:25 -05:00
LetterJay
9d6dec8975 Update cart.dm 2017-06-27 05:12:05 -05:00
LetterJay
163bcf0189 Delete PDA.dm.rej 2017-06-27 05:11:20 -05:00
LetterJay
926589fd58 Update PDA.dm 2017-06-27 05:11:06 -05:00
LetterJay
ccf4306224 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-06-26 23:19:54 -05:00
LetterJay
e2ccf1f52f rej cleanup 2017-06-26 23:19:17 -05:00
LetterJay
914434891a Merge pull request #1744 from Citadel-Station-13/upstream-merge-28685 
[MIRROR] Fixes the sprite for the nullrod clown dagger skin
 2017-06-26 10:52:21 -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
edcadfe83e Merge pull request #1787 from Citadel-Station-13/upstream-merge-28765 
[MIRROR] Small jungle trees
 2017-06-26 10:10:34 -05:00
CitadelStationBot
b16aa00517 Small jungle trees 2017-06-26 09:42:52 -05:00
CitadelStationBot
ac33b9defb Adds some neat tiles and walls for use on lavaland 2017-06-26 09:19:17 -05:00
LetterJay
028752c3de Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564 
[MIRROR] Shuttle engines affecting travel time
 2017-06-26 09:00:54 -05:00
LetterJay
46c3108267 Merge pull request #1772 from Citadel-Station-13/upstream-merge-28749 
[MIRROR] Exporting mechs!
 2017-06-26 06:28:22 -05:00
LetterJay
d3c2f5aee6 Merge pull request #1778 from Citadel-Station-13/upstream-merge-28766 
[MIRROR] Robotic legs are not weak to glass shards
 2017-06-26 06:26:46 -05:00
LetterJay
e3b1838e63 Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600 
[MIRROR] Adds a heavily-damaged ripley as a lavaland ruin
 2017-06-26 06:24:31 -05:00
LetterJay
2fc5c3785a Merge pull request #1782 from Citadel-Station-13/upstream-merge-28789 
[MIRROR] Fixes resin attack message
 2017-06-26 06:18:36 -05:00
LetterJay
d138c56781 Merge pull request #1664 from Citadel-Station-13/upstream-merge-28505 
[MIRROR] Vending machines accept space cash.
 2017-06-26 06:15:19 -05:00
LetterJay
f1937eb1fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-06-26 06:14:55 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
LetterJay
faa0849b4b Merge pull request #1663 from Citadel-Station-13/upstream-merge-28573 
[MIRROR] Alien closets now correctly cost two alloy to make (Fixes #28561)
 2017-06-26 06:13:59 -05:00
LetterJay
68c45f5569 Merge pull request #1661 from Citadel-Station-13/upstream-merge-28539 
[MIRROR] Runes now innately support doing damage to their invokers
 2017-06-26 06:07:53 -05:00
CitadelStationBot
04dd1ffdbd Fixes resin attack message 2017-06-26 06:03:44 -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
LetterJay
ed6c0b042e Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227 
[MIRROR] Clown Toy Box + Wooden Crates
 2017-06-26 04:29:08 -05:00
LetterJay
53afc150f9 Merge pull request #1581 from Citadel-Station-13/upstream-merge-28398 
[MIRROR] Changes config tag for secret extended
 2017-06-26 02:30:58 -05:00
CitadelStationBot
1982321419 Robotic legs are not weak to glass shards 2017-06-25 23:47:38 -05:00
CitadelStationBot
1a38b6fd6f Shuttle engines affecting travel time 2017-06-25 20:53:00 -05:00