shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,299 Commits 5 Branches 0 Tags
cf9aff2995e41d760804aa80339e973260f2d3ea
Commit Graph

87 Commits

Author SHA1 Message Date
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
bawhoppen
0ad78d0c44 frown emoji (#31393) 2017-10-07 19:11:17 -05:00
LetterJay
0c6be827a2 Merge pull request #3195 from Citadel-Station-13/upstream-merge-31364 
[MIRROR] Fixes Wood Being Invisible.
 2017-10-07 01:08:18 -04:00
Kerbin-Fiber
19ff9a0f75 Fixes Wood Being Invisible. (#31364) 
* Fixes Wood

* Makes jackboots store items small and smaller just like in the description.

* Update internal.dm
 2017-10-06 21:46:15 -05:00
Xhuis
97e5c9b590 Fixes runed metal and brass sprites 2017-10-06 03:19:23 -05:00
YPOQ
33364920b3 Fixes crafting stacks without breaking crafted machinery (#31298) 
* Revert "Fixes stacking when crafting items"

* Fixes crafted stacked items properly

* Update stack.dm
 2017-10-05 09:25:08 -05:00
bawhoppen
460fea66c8 Moves all stack object sprites from items_and_weapons.dmi to their own file 2017-10-04 11:59:53 -05:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
kingofkosmos
f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
AutomaticFrenzy
91c1a78af9 Fixed duplicate definition (#31048) 2017-09-28 10:43:24 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
CitadelStationBot
b09aa9d082 [MIRROR] Fixes stacking when crafting items (#2814) 
* Merge pull request #30746 from YPOQ/stackfix

Fixes stacking when crafting items

* Fixes stacking when crafting items
 2017-09-17 12:03:31 -05:00
CitadelStationBot
af0080b00b [MIRROR] Stops ranged stack splitting (#2785) 
* Merge pull request #30695 from KorPhaeron/magicstacks

Stops ranged stack splitting

* Stops ranged stack splitting
 2017-09-15 02:51:53 -05:00
CitadelStationBot
e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
Militaires
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
LetterJay
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
Poojawa
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
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
72cf7083f6 Fixes leathercrafting recipies trying to build on the floor. 2017-08-17 09:19:09 -05:00
CitadelStationBot
1b2efdcc1d More Initialize() garbage 2017-08-06 18:02:51 -05:00
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
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
9d7820a81c Fixes two consistency/grammar issues (#2161) 2017-07-28 23:51:36 -07:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
b770348797 Fixes wrapping objects 2017-07-09 10:14:16 -05:00
CitadelStationBot
2d84e09851 Fixes plasma glass merging with normal glass 2017-07-08 09:45:46 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05: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
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
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
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
CitadelStationBot
1982321419 Robotic legs are not weak to glass shards 2017-06-25 23:47:38 -05:00
CitadelStationBot
f0dc32ef4f Space cash descriptions are more descriptive (#1651) 2017-06-20 08:04:28 -07:00
LetterJay
a4c9dc43dd Dufflebag => Dufflebag 2017-06-19 16:42:05 -05:00
CitadelStationBot
ba0e9e8e93 Alien closets now correctly cost two alloy to make (Fixes #28561) 2017-06-18 20:20:49 -05:00
CitadelStationBot
2fa5d08bf5 Prevents cyborgs from extruding materials (#1463) 2017-06-17 13:32:44 -07:00
CitadelStationBot
4bd99124de Adds F.R.A.M.E. cartridge 2017-06-10 12:18:31 -05:00
CitadelStationBot
f26cf4e9ef Clown Toy Box + Wooden Crates 2017-06-09 11:02:37 -05:00
LetterJay
190b47983c cleanup 2017-06-08 03:39:13 -05:00