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 |
|
silicons
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
TrilbySpaceClone
|
f2e4b7eacc
|
grammer
|
2020-08-04 10:07:04 -04:00 |
|
TrilbySpaceClone
|
0f29235e6a
|
Tea Party
|
2020-08-04 09:15:44 -04:00 |
|
Letter N
|
9a9e3ffef5
|
fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category.
|
2020-08-03 21:14:17 +08:00 |
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
Letter N
|
5d4bb48628
|
another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator
|
2020-07-29 15:10:01 +08:00 |
|
Lin
|
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 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
Timothy Teakettle
|
ed8723e74e
|
Merge branch 'master' into species-are-dumb
|
2020-07-23 22:15:10 +01:00 |
|
Timothy Teakettle
|
8f8aaee36c
|
fixes up drinks
|
2020-07-23 22:09:14 +01:00 |
|
Timothy Teakettle
|
450509347a
|
tidy species more
|
2020-07-23 21:57:32 +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
|
2f11fb6a8b
|
ok
|
2020-07-21 11:59:39 -07:00 |
|
silicons
|
184e3992f3
|
fixes
|
2020-07-21 11:56:23 -07:00 |
|
silicons
|
4d48abf3a6
|
fixes
|
2020-07-21 11:46:17 -07:00 |
|
Timothy Teakettle
|
4b70e29e36
|
let the fry smite work
|
2020-07-20 19:42:07 +01:00 |
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
Timothy Teakettle
|
eab0ae8af0
|
small changes
|
2020-07-20 17:20:54 +01:00 |
|
timothyteakettle
|
e2b68797b7
|
bugfixes
|
2020-07-20 00:49:00 +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 |
|
Lin
|
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 |
|
silicons
|
8caf063765
|
Merge pull request #12757 from Owai-Seek/better-snack-comments
Updates some comments.
|
2020-07-17 17:09:50 -07:00 |
|
Winter Flare
|
61f4fbc67a
|
Merge branch 'master' into foodport-p2-7/12/20
|
2020-07-17 19:27:50 -04:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07: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 |
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03: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 |
|