86 Commits
Author SHA1 Message Date
zerothebigboy e1a5fe7894 pain 2021-09-03 07:45:52 -04:00
skodaiandGitHub 275a946031 Update food.dmi (#14601) 2021-04-14 14:06:00 +02:00
ItzGabby 4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
timothyteakettle 22cab3c275 sprite fixes 2021-01-05 23:28:53 +00:00
Timothy Teakettle 535dede85b i teleported bread 2021-01-05 22:20:41 +00:00
siliconsandGitHub 4382fd7073 Merge pull request #13767 from MrJWhit/new-meat-sprites
Pretty meat icons update
2020-12-13 23:09:26 -07:00
MrJWhit f5b99b83f8 Fully functional 2020-12-13 02:29:29 -05:00
MrJWhit 4c1013e455 Update food.dmi 2020-12-12 23:53:55 -05:00
shellspeed1 2ffcdb4862 Soups on 2020-10-06 16:07:29 -07:00
siliconsandGitHub c1d8d1d439 Merge pull request #13090 from lolzalolka/lean
Added Burek to Space
2020-08-11 01:42:58 -07:00
chrisbbbbbbb e8ac70696f new food idk? 2020-08-09 18:58:32 +02:00
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Winter Flare 506ddd83fe Meatloaf, Meatball sub, fixes. 2020-07-18 22:16:19 -04:00
Winter Flare 89ecaf3b82 Potato Meals, Sweet and Sour. 2020-07-18 20:53:16 -04:00
Winter Flare 2effbf4db0 Fixes Spiral, and Cracker Box 2020-07-18 18:53:47 -04:00
Winter Flare 5611e23584 Update Spiral Soup sprite 2020-07-17 18:54:17 -04:00
Winter Flare 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
Winter Flare c92d88d794 Nuggie Box Shift
Shifts Chicken Nugget Boxes down 4 pixels.
2020-07-12 19:56:17 -04:00
siliconsandGitHub 6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
2020-07-08 03:10:44 -07:00
Winter Flare 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
timothyteakettle 27a83ebb05 sprite pls 2020-06-30 01:14:48 +01:00
timothyteakettle 6852506469 improve tray sprite 2020-06-30 01:04:50 +01:00
timothyteakettle 2e4c5e322d tray and jar 2020-06-29 02:49:31 +01:00
The0bserver 3cb03387ed Sprites. 2020-06-11 15:23:26 -04:00
Timothy TeakettleandGitHub 14c9ab2ff1 ports tgs regal rats (#12479)
* port regal rats

* fix missing line

* royal rat goes after humans too

* okay dont let them attack people

* let them attack people but at less damage

* remove header
2020-06-09 03:28:00 -07:00
Ghommie aaa31c24ce Demodularizing a few sprite assets. 2020-05-08 04:02:31 +02:00
Winter Flare 4d9869aad0 Adjusts Sandwich Sprites 2020-04-22 19:56:47 -04:00
ForrestWick 430d179c73 whoops, forgot the dmi 2020-04-09 17:38:06 -05:00
kevinz000andGitHub dd90d21f93 Merge pull request #11645 from Trilbyspaceclone/vaild
Et tu?
2020-03-28 15:58:56 -07:00
TrilbySpaceClone 879b626cd1 Et tu 2020-03-27 03:12:04 -04:00
Winter Flare 5c3037b5d0 Fixed Several Foods, Strawberry Juice
Add Strawberry Juice
Port Salami
https://github.com/tgstation/tgstation/pull/48817
https://github.com/tgstation/tgstation/pull/49228
Ports some TG Drinks
https://github.com/tgstation/tgstation/pull/48783

Made lizards like:
Egg Wrap

Tweaked Soda Dispenser
Moved Egg Wraps
Tweaked Strawberry Tea and Strawberry Milk recipies.
2020-03-22 00:19:28 -04:00
Winter Flare eaab44735b Fix Fiesta Skewer
Fiesta Skewer icon was missing.
2020-03-10 01:01:23 -04:00
Winter Flare bb9066e9cb Food Additions / Butter Bear
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold

Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
2020-03-08 14:36:08 -04:00
TrilbySpaceClone 2f492881ce rouge pixle 2020-03-06 09:09:28 -05:00
TrilbySpaceClone f1116648a8 corrects snowcones 2020-03-06 09:08:05 -05:00
Winter Flare 082085f143 Poppy Muffin (Fug You Derk) 2020-02-10 23:09:36 -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
Kraseo 6708607073 fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly 2020-01-18 15:05:07 +01:00
Ghommie 4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Seris02 a39c0249c4 marshmallow 2019-12-29 21:55:25 +08:00
Ghommie 37441437d1 a 2019-12-28 23:02:28 +01:00
TrilbySpaceClone 784ea3f5e1 readds sprites 2019-12-22 03:06:04 -05:00
TrilbySpaceClone 025a7cd79a more ports
https://github.com/tgstation/tgstation/pull/46924
https://github.com/tgstation/tgstation/pull/48050
2019-12-07 03:04:02 -05:00
TrilbySpaceClone c4450579ac Why does breakfast have a timer?
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
2019-12-07 01:53:55 -05:00
Ghommie c0130467db Unmodularize space kiwis and banana spiders. 2019-10-26 18:15:02 +02:00
TrilbySpaceClone 74fc240f0e weh 2019-09-03 11:13:11 -04:00
TrilbySpaceClone d3852ebd56 even more 2019-08-29 19:39:10 -04:00
TrilbySpaceClone db317b65af Grand! 2019-08-24 19:39:15 -04:00
TrilbySpaceClone 044ef51dfa Relies on a PR 2019-08-20 18:32:39 -04:00
TrilbySpaceClone 893c9c9c63 A correction? 2019-08-08 17:45:58 -04:00