cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,020 Commits 55 Branches 0 Tags
3c973816d1f400eeb83e53e5d449094a218e6d08
Commit Graph

236 Commits

Author SHA1 Message Date
Artur
098b6642ae Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-22 16:19:17 +03:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Artur
c73295279e Fixes asset cache client 2020-05-19 19:02:46 +03:00
kevinz000
810da1b7c8 changes 2020-05-18 04:41:10 -07:00
Trilbyspaceclone
fa8351ebd1 Update dinnerware.dm (#12276) 2020-05-18 00:13:26 +02:00
TheObserver-sys
e4063311fb Finally, peas. (#12211) 
* Establishment of peas, at last. Comes with two mutations! (NO SPRITES YET,SAVING SO I LOSE NO WORK)

* Fixed some shit in my code, like mispellings and an illegal color. God forgive me.

* Eventually, I will find a blue that works.

* It helps when you aren't pants on head, and remember to put the equals sign, my dude.

* Cleaned up some names, added some comments, and trying to make Pax be captialized in the manipulator

* Attempting to fix Pax to be uppercase, also a slight tweak to reagent numbers.

* I honestly don't care enough, and it doesn't like me capitalizing Pax, so fuck it.

* Cleaned some shit up, fixed a problem I noticed where I forgot an entire line of code because I am Big Big Smart Plant.

* Everything should taste now. Thanks to Anne for the advice. (also shifts a few nutriment values about)

* because I am stupid, I forgot a comma.

* Pray for no map by map. 2nd to last commit.

* I really didn't like how the species names looked.

* First set of pea sprites complete, shoutouts to TripleZeta

* Adds Laughin' Peas sprites! Shoutouts to Stewydeadmike!

* fixed a spelling mistake

* Hey look ma, it's not a disorganized mess anymore

* Bugsquashing... maybe?

* Adds World Peas Sprites! Shoutouts to Stewydeadmike!

* It would help if I actually put the harvest product and seed product eh? Try to remember to do that next time.

* Spriter wasn't happy with old laughpeas sprite.

* cleans up taste text, removes empty lines.

* better taste for a terrible wine.

* Travis leave me alone

* Pax reduction

Co-authored-by: The0bserver <Gizmomaster777@gmail.com>
 2020-05-15 07:16:50 -07:00
Ghom
63fb4544b4 Another fix for contraband items costing like premium ones. (#12253) 2020-05-15 07:16:25 -07:00
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghommie
88e499a39a Some quick economy fixes and improvements. 2020-05-13 03:31:16 +02:00
Ghommie
757706653d Map paths. 2020-05-12 21:01:34 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Lin
0acec2e56f vendors now accept dollar bills again (#12109) 
* make vendors accept bills

* build

* forgot that function

* this is better

* i thought i had a hook for this
 2020-05-05 05:38:19 +02:00
Ghommie
b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
Ghommie
1cb83547fa whops! 2020-05-03 03:23:00 +02:00
Ghommie
53c0ea391e steam sales. 2020-05-03 02:54:13 +02:00
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
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03: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