shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,159 Commits 5 Branches 0 Tags
fcfff59ea6cbe7e5fe36de1e048c1a0db448000e
Commit Graph
1400 Commits
Author SHA1 Message Date
KathrinBailey 97733e464d ghommie change and armrest bug fix 2020-03-04 01:35:00 +00:00
KathrinBailey 7e0abda3c1 fixing merge conflicts 
includes trillby's new posters.
 2020-03-03 13:56:01 +00:00
KathrinBailey 83ec1e428c Merge remote-tracking branch 'upstream/master' into Kat-Furniture 2020-03-03 13:48:18 +00:00
KathrinBailey fe7742637f fixing merge conflicts aaahh 2020-03-03 13:47:58 +00:00
KathrinBailey a240daaca2 Final changes 
Puts curtain crafting under plastic to stop plastic duping. You can deep rods and cloth, but the cost is 10 plastic sheets and it doesn't drop 10 plastic sheets so it's a loss.
 2020-03-03 13:19:15 +00:00
GhomandGitHub f9a2326437 Merge pull request #11203 from Trilbyspaceclone/poster 
Three new posters!
 2020-03-03 13:29:54 +01:00
TrilbySpaceClone ee4f446a59 better backrounds 2020-03-01 08:47:23 -05:00
KathrinBailey d817442f02 It works! 
Everything works now.
 2020-03-01 13:42:14 +00:00
KathrinBailey 72d3572ec3 New sofas added, need to be added to sheet_types.dm still 
Backing up the .dmi changes and two comfy chairs.
 2020-03-01 11:58:59 +00:00
ancientpowerandGitHub 5c5ec541ae Merge branch 'master' into paramedic-tweaks 2020-02-29 01:55:46 -06:00
LinandGitHub 252c64f23b Merge pull request #11200 from Hatterhat/boxes 
blue boxes are now actually blue, and red boxes are actually red
 2020-02-29 00:15:45 -06:00
ancientpower ed320046c5 fixes icons 2020-02-28 11:42:15 -06:00
ancientpower 23c3e5b328 tweaks for the tweaks 2020-02-28 00:17:28 -06:00
ancientpower 12ba71f588 paramedic tweaks 2020-02-27 23:23:44 -06:00
kevinz000 fa9e275237 k 2020-02-24 13:16:12 -07:00
kevinz000 59e95555bb Merge remote-tracking branch 'citadel/master' into staves 2020-02-24 13:09:45 -07:00
kevinz000andGitHub 8cf41997f5 Merge pull request #11201 from Hatterhat/bows 
really just a lot of shit about bows
 2020-02-24 02:33:54 -07:00
kevinz000andGitHub 43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic 
Adds epic and also cool paramedics [lazy tg port]
 2020-02-24 02:30:36 -07:00
kevinz000andGitHub 6dcbf4df6f Merge pull request #11188 from Trilbyspaceclone/more_sweets 
The plywood chair sprites now looks better
 2020-02-24 02:24:19 -07:00
kevinz000andGitHub 4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N 
Makes all IPC organs look robotic!
 2020-02-24 02:24:06 -07:00
GhomandGitHub f5dbb0b20d Merge pull request #11187 from Trilbyspaceclone/sweet 
New bar sign, The Hive
 2020-02-23 22:47:37 +01:00
TrilbySpaceClone aeacb06dfc charrrries 2020-02-22 18:21:47 -05:00
TrilbySpaceClone 6a8c874779 Three new posters! 2020-02-22 17:38:25 -05:00
Hatterhat 0cd936e33e bowstrings 2020-02-22 15:02:07 -06:00
Hatterhat 061548240a why were the colors reversed 2020-02-22 14:50:40 -06:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
TrilbySpaceClone 9ae903187f always abuzz 2020-02-21 04:18:24 -05:00
TrilbySpaceClone 7d8f1320b3 it looks nicer 2020-02-21 03:07:42 -05:00
Detective Google 7889ea0d68 fix + maps 2020-02-20 22:58:43 -06:00
GhomandGitHub e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l 
adds the POOL to box station
 2020-02-21 02:43:04 +01:00
GhomandGitHub 26bbc64f16 Merge pull request #11136 from Owai-Seek/broomport-2-17-19 
Ports Broom, Tweak Janitor Vendor
 2020-02-20 11:48:06 +01:00
kevinz000andGitHub 6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows! 
Silk into clothing, bows, arrows, quivers and more!
 2020-02-19 19:05:49 -07:00
kevinz000 b66b8ac2a0 Merge remote-tracking branch 'citadel/master' into staves 2020-02-19 14:32:28 -07:00
GhomandGitHub 0619521418 Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4 
Corrects a few cargo crates/exports (and nerfs some)
 2020-02-19 02:10:25 +01:00
kevinz000 d7949e810e Merge remote-tracking branch 'citadel/master' into staves 2020-02-18 02:20:58 -07:00
kevinz000andGitHub ed36aae74b Merge pull request #11112 from necromanceranne/mech-revival 
Mech Stuff: Ports /tg/ pr #44529, reverts #9092 (mostly)
 2020-02-18 02:18:57 -07:00
Winter Flare 1a994e7f1e Ports Broom, Tweak Janitor Vendor 
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120

Makes Broom printable.

Reduces Broom sound effect.

Updates Janitor Vendor to have equipment for at least 2 janitors.
 2020-02-17 23:36:22 -05:00
Ghommie e1eb781d4b ffs 2020-02-16 18:56:57 +01:00
Ghommie 1a0fba8a2a Something about consistency and magnetic rifles. 2020-02-16 18:37:51 +01:00
necromanceranne 5c2e244ee0 Ports /tg/ pr #44529, reverts #9092 2020-02-16 22:20:50 +11:00
GhomandGitHub 06d38eb3dc Merge pull request #11086 from YakumoChen/the-ring-2 
Ring Improvements
 2020-02-15 09:04:54 +01:00
TrilbySpaceClone bbe1ddc0cf silk, bows, and graytide! 2020-02-14 23:04:02 -05:00
GhomandGitHub 33931da018 Merge pull request #11013 from r4d6/pickaxe 
Add two more pickaxes, Titanium & Plasteel
 2020-02-14 19:34:01 +01:00
GhomandGitHub 64882b8a90 Merge pull request #10993 from Linzolle/bows 
adds the bow
 2020-02-14 08:01:12 +01:00
YakumoChenandGitHub 3f155a9f13 less shitty rings 
stolen from RP
 2020-02-13 21:55:32 -05:00
GhomandGitHub 121b37410a Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20 
Sprites, Tweaks, and Snacks, QoL
 2020-02-13 16:40:12 +01:00
GhomandGitHub b3a530abc9 Merge pull request #11027 from ShadeAware/capsdrobe2 
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
 2020-02-13 09:40:22 +01:00
Winter Flare 0b008db5e6 Import Cogchamp 2020-02-13 03:36:54 -05:00
Winter Flare f32affdb1c Made Mugs Colorful 2020-02-13 03:26:35 -05:00
kevinz000andGitHub c790478a3d Merge pull request #11012 from keronshb/RatvarDrink 
Introduces the Ratvarian mixed drink, the CogChamp!
 2020-02-12 23:58:14 -07:00