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 and GitHub
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 and GitHub
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
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
Artur
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
Ghom and GitHub
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
Artur
765ffdb1a1
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
Ghommie
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
Ghom and GitHub
b69a31fef1
Merge pull request #12565 from timothyteakettle/some-small-fixes
...
two small fixes
2020-06-23 03:36:16 +02:00
Artur
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
silicons and GitHub
99a7c49e52
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
...
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
Timothy Teakettle
983aac10a2
fixes it properly
2020-06-21 17:39:36 +01:00
Timothy Teakettle
7fa5107b4b
all methods of cooking define quality
2020-06-19 17:16:34 +01:00
shellspeed1
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
Artur
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
Timothy Teakettle
d7bce8aec0
ports some events
2020-06-15 20:22:40 +01:00
Timothy Teakettle and GitHub
5df4931266
fix food cart ( #12523 )
2020-06-14 22:50:16 -07: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 and GitHub
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
Timothy Teakettle and GitHub
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
Artur
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
Rohesie and GitHub
2857a13933
nested ( #12381 )
2020-05-28 14:12:58 +02:00
Artur
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
Ghom and GitHub
9d2399ce9f
Removing unused files and fixing some stuff. ( #12250 )
2020-05-15 07:15:15 -07:00
899c5a4575
Corrects evey storge with storage ( #12220 )
...
* Update medical.dm
* Update autobottler.dm
* Update autobotter_designs.dm
* Update medical_designs.dm
* Update hardsuit.dm
* Update code/modules/cargo/bounties/medical.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-13 21:21:11 +02: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
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
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
Lin and GitHub
c3dfcf1cfe
Merge pull request #12104 from timothyteakettle/food-quality-2
...
sliced foods have the same quality as the item that was cut
2020-05-05 00:46:44 +00:00
Putnam3145 and GitHub
bb2942d0b8
Fixes a gibber runtime. ( #12103 )
2020-05-04 05:05:13 +02:00
Timothy Teakettle
5f14ae28a1
food quality with sliced foods
...
yay
2020-05-03 23:06:54 +01:00
Ghommie
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
Winter Flare