shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,583 Commits 5 Branches 0 Tags
a194d7dafe6c07ac6fdf8cfe3c725f3bf1cccdfe
Commit Graph

219 Commits

Author SHA1 Message Date
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Arturlang
53395171e1 Fixes vendors some (#12056) 2020-05-01 17:59:04 +02:00
Trilbyspaceclone
e33087cbf2 corrects vending tackler gloves 2020-04-26 22:06:35 -04:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
TrilbySpaceClone
c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
Lin
df4452468a Merge pull request #11932 from Ghommie/Ghommie-cit695 
Some mispelled filepaths.
 2020-04-22 16:09:33 +00:00
TrilbySpaceClone
25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
Ghommie
98081aa56b Some mispelled filepaths. 2020-04-19 03:15:51 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
spookydonut
a6f6a27c87 Update code/modules/vending/_vending.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-12 00:53:57 +08:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
Arturlang
f80900fd0b Fixes vendors not eating coins (#11795) 2020-04-09 19:07:11 +02:00
Artur
5fbe05f3c9 Cleaning up and finishing up 2020-04-08 18:16:10 +03:00
Artur
f26f0c2555 Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix 2020-04-05 18:21:50 +03:00
Artur
881f8765f4 Stufffs 2020-04-01 15:29:40 +03:00
Artur
65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur
f40f07b033 [READY]Skateboard overhaul (#45657) 
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
 2020-04-01 12:05:27 +03:00
Artur
4d53c3f6c0 updates vendors.. 2020-03-31 21:00:50 +03:00
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627 
More or less ports "Clothing /under repath"
 2020-03-23 10:40:31 -07:00
Winter Flare
9d9720ed21 QoL Vendor Reorganisation 
Moves Bowls and Glasses to top of vendors.
 2020-03-22 15:30:29 -04:00
Winter Flare
cd3f8f5df5 Porting More Stuff 
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
 2020-03-22 15:13:00 -04:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghom
9066287037 Oh yea I forgot tg repathed many /under clothes a while ago. 2020-03-07 00:42:18 +01:00
Ghommie
e3e15ea7a4 accidental revert. 2020-03-07 00:30:10 +01:00
Ghommie
a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
ancientpower
c4113824f7 more fixes 2020-02-29 01:47:19 -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
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
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
Ghom
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
Winter Flare
3b5ec22076 Vendor Nerf 2020-02-13 03:54:31 -05:00
ShadeAware
195760e572 h 2020-02-12 16:37:00 -05:00
ShadeAware
0f603f2aff Fixes icon state for the refill 
Thank you for the catch, Ghommie.
 2020-02-12 16:34:16 -05:00
ShadeAware
5afbe44be3 Attempt Numero Dos! 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2020-02-11 17:27:40 -05:00
Winter Flare
bb641fecf8 Sprites, Tweaks, and Snacks 
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.

Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
 2020-02-09 23:07:32 -05:00
kevinz000
3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice 
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
 2020-02-06 23:52:49 -07:00
Trilbyspaceclone
b7613a43ae corrects this missing sprite 2020-02-04 16:23:36 -05:00
TrilbySpaceClone
06fd6645b3 And it wokrs 2020-02-04 16:01:22 -05:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghom
96a38e6c18 Merge pull request #10837 from Owai-Seek/tinytweaks 
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
 2020-02-02 18:07:25 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Winter Flare
59b5b0b9a6 A bunch of tiny tweaks. 
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
 2020-02-01 04:49:56 -05:00
necromanceranne
43c4debb4f Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits. 2020-01-31 11:54:18 +11:00
Seris02
dbb6218e0d merp 2020-01-30 14:54:07 +08:00
Ghommie
5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
kevinz000
ea9513864d Merge pull request #10674 from Xantholne/lunar01 
Culturally Appropriate Lunar Clothes
 2020-01-24 16:14:32 -07:00