81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
ed8723e74e
Merge branch 'master' into species-are-dumb
2020-07-23 22:15:10 +01:00
8f8aaee36c
fixes up drinks
2020-07-23 22:09:14 +01:00
450509347a
tidy species more
2020-07-23 21:57:32 +01:00
db24df58a0
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:36:46 -07:00
9f66163d4f
Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
...
Ports several food sprites/foods from Baystation/Citadel RP
2020-07-23 10:35:30 -07:00
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
2f11fb6a8b
ok
2020-07-21 11:59:39 -07:00
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
4d48abf3a6
fixes
2020-07-21 11:46:17 -07:00
4b70e29e36
let the fry smite work
2020-07-20 19:42:07 +01:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
eab0ae8af0
small changes
2020-07-20 17:20:54 +01:00
e2b68797b7
bugfixes
2020-07-20 00:49:00 +01:00
8709a72fc0
fry everything
2020-07-20 00:40:18 +01:00
e416a2377e
Merge branch 'master' into foodport-p2-7/12/20
2020-07-19 18:58:52 -04:00
1ebb81e44c
Fixes, final tweaks.
2020-07-19 18:52:20 -04:00
506ddd83fe
Meatloaf, Meatball sub, fixes.
2020-07-18 22:16:19 -04:00
89ecaf3b82
Potato Meals, Sweet and Sour.
2020-07-18 20:53:16 -04:00
2effbf4db0
Fixes Spiral, and Cracker Box
2020-07-18 18:53:47 -04:00
ba3dc6a73b
Merge pull request #12679 from silicons/unarmed_parry
...
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
8caf063765
Merge pull request #12757 from Owai-Seek/better-snack-comments
...
Updates some comments.
2020-07-17 17:09:50 -07:00
61f4fbc67a
Merge branch 'master' into foodport-p2-7/12/20
2020-07-17 19:27:50 -04:00
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
d6413d5559
Adds Cracker Box, Soup
...
Fixes stray pixels on some sushi sprites.
Adds Spiral Soup, Bear Chili
Adds Cracker Box
2020-07-14 22:43:34 -04:00
d7f5de97da
Oops.
2020-07-12 22:34:32 -04:00
20cc3cad55
re-add bitesize.
2020-07-12 22:15:06 -04:00
351d1748fc
Updates some comments.
2020-07-12 22:05:08 -04:00
6cbab55ef8
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-07 21:07:58 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
280d3de6c3
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03:00
870bb8f804
Actual BLT Stuff
...
This is why I test things. Also, I shouldn't do this before I try to sleep.
2020-07-03 09:48:35 -04:00
bef462b4ae
BLT Sandwich
2020-07-03 08:50:54 -04:00
5b923623d3
Sprite Updates + Food Ports
...
Ports/Adds, or updates the sprites for:
Cooked Carp
Bear Steaks
Raw and Cooked Chicken
Raw Meatball (Unused, adding for future PR)
Ports:
Chili Cheese Fries
Margarine
BLT (In next Commit)
Fix:
Tuna Sandwich now uses 5u Mayo, instead of 5 jars of mayo.
Tuna Sandwich is now visible.
2020-07-03 08:33:01 -04:00
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
b280c0f550
Merge pull request #12622 from timothyteakettle/grammar-fixes
...
big batch of spelling/grammar corrections
2020-06-29 21:13:06 +02:00
76b5557e1e
bunch of grammar corrections
2020-06-27 02:12:44 +01:00
765ffdb1a1
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
b69a31fef1
Merge pull request #12565 from timothyteakettle/some-small-fixes
...
two small fixes
2020-06-23 03:36:16 +02:00
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
99a7c49e52
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
...
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
983aac10a2
fixes it properly
2020-06-21 17:39:36 +01:00
7fa5107b4b
all methods of cooking define quality
2020-06-19 17:16:34 +01:00
b490f02c78
Ports IV bags from TG
...
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
2020-06-18 02:30:58 -07:00
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
d7bce8aec0
ports some events
2020-06-15 20:22:40 +01:00
5df4931266
fix food cart ( #12523 )
2020-06-14 22:50:16 -07:00
08be1292cd
It's Mad Funny when everything breaks!
...
And even funnier still when you have to start all over again!
2020-06-11 15:02:17 -04:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
Lin