MrJWhit
f5b99b83f8
Fully functional
2020-12-13 02:29:29 -05:00
Putnam3145
f7034818a4
Merge pull request #13672 from Citadel-Station-13/silicons-patch-4
...
chief sub
2020-11-18 17:50:50 -08:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
silicons
cbb6febfe2
Update snacks_sandwichtoast.dm
2020-11-11 13:56:18 -07:00
shellspeed1
2c59a5b9f8
more spelling
2020-10-06 17:36:57 -07:00
shellspeed1
3f634743e1
spelling
2020-10-06 16:27:12 -07:00
shellspeed1
2ffcdb4862
Soups on
2020-10-06 16:07:29 -07:00
Blue Wildrose
7f028899fa
Forgot valid salid - also included ambrosia deus, white cannabis, and lime fruit
2020-09-09 22:18:17 -07:00
Blue Wildrose
1b77e69fb4
Slimepeople diet changes
2020-09-09 18:11:25 -07:00
silicons
8699ce2174
fixes a bunch of broken clickdelays ( #13218 )
...
* fixes
* fix
2020-08-25 20:58:20 +02:00
silicons
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
Winter Flare
76293ee032
My balls are raw. Meatballs, that is. ( #13075 )
...
* Food Processor produces Raw Meatball
* No nutrition loss from slabs.
2020-08-09 16:01:52 +02:00
Putnam
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
silicons
db24df58a0
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:36:46 -07:00
silicons
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
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
Timothy Teakettle
4b70e29e36
let the fry smite work
2020-07-20 19:42:07 +01:00
Timothy Teakettle
eab0ae8af0
small changes
2020-07-20 17:20:54 +01:00
timothyteakettle
8709a72fc0
fry everything
2020-07-20 00:40:18 +01:00
Winter Flare
e416a2377e
Merge branch 'master' into foodport-p2-7/12/20
2020-07-19 18:58:52 -04:00
Winter Flare
1ebb81e44c
Fixes, final tweaks.
2020-07-19 18:52:20 -04: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
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
d7f5de97da
Oops.
2020-07-12 22:34:32 -04:00
Winter Flare
20cc3cad55
re-add bitesize.
2020-07-12 22:15:06 -04:00
Winter Flare
351d1748fc
Updates some comments.
2020-07-12 22:05:08 -04:00
Winter Flare
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
Winter Flare
bef462b4ae
BLT Sandwich
2020-07-03 08:50:54 -04: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
Ghom
b280c0f550
Merge pull request #12622 from timothyteakettle/grammar-fixes
...
big batch of spelling/grammar corrections
2020-06-29 21:13:06 +02:00
timothyteakettle
76b5557e1e
bunch of grammar corrections
2020-06-27 02:12:44 +01:00
Ghommie
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
Ghom
b69a31fef1
Merge pull request #12565 from timothyteakettle/some-small-fixes
...
two small fixes
2020-06-23 03:36:16 +02:00
Timothy Teakettle
983aac10a2
fixes it properly
2020-06-21 17:39:36 +01:00
Timothy Teakettle
d7bce8aec0
ports some events
2020-06-15 20:22:40 +01:00
The0bserver
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
Ghom
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
Timothy Teakettle
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
Ghom
9d2399ce9f
Removing unused files and fixing some stuff. ( #12250 )
2020-05-15 07:15:15 -07: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
Trilbyspaceclone
b019915d10
Removes alien crate adds ape crate ( #12178 )
...
* Update science.dm
* Update snacks_meat.dm
* Update science.dm
* Apply suggestions from code review
kinda didnt want to just take tg's ape cubes but what ever
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-11 01:10:45 +02:00
Ghommie
aaa31c24ce
Demodularizing a few sprite assets.
2020-05-08 04:02:31 +02:00
Timothy Teakettle
5f14ae28a1
food quality with sliced foods
...
yay
2020-05-03 23:06:54 +01: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
