shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,909 Commits 5 Branches 0 Tags
bef462b4ae0c54cf03e98de2399cb5fc98c73237
Commit Graph

15091 Commits

Author SHA1 Message Date
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
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghom
3c4a288ecc Merge pull request #12625 from Citadel-Station-13/silicons-patch-9 
maybe fixes edge cases where half the server has their client input system broken
 2020-06-30 00:21:42 +02:00
silicons
771714cc78 Merge pull request #12629 from kappa-sama/patch-28 
https://github.com/tgstation/tgstation/pull/51886 by Fikou
 2020-06-29 14:50:59 -07:00
silicons
52953cae4d Merge pull request #12598 from timothyteakettle/improves-char-customization 
speech options on char customization, small skeleton changes
 2020-06-29 14:47:25 -07:00
Timothy Teakettle
a7c905dfe9 handles skeletons better 2020-06-29 22:37:04 +01:00
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825 
More and more fixes.
 2020-06-29 14:18:10 -07:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
Putnam3145
42809d8b0c Merge pull request #12416 from Ghommie/Ghommie-cit792 
TGUI-next Check Skills menu.
 2020-06-29 12:44:08 -07:00
Ghommie
fa25858fd7 Fix. :) 2020-06-29 21:31:24 +02: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
Ghom
8cc7b4fea0 Merge pull request #12643 from YakumoChen/master 
Minor fix
 2020-06-29 19:25:34 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
YakumoChen
3b802ac062 actually stocks the new clothing 2020-06-29 13:38:36 +00:00
silicons
6265cb190b Update bindings_client.dm 2020-06-29 05:04:28 -07:00
silicons
9697e1b946 Update bindings_client.dm 2020-06-29 04:42:58 -07:00
Ghommie
5307676317 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-06-29 06:55:35 +02:00
silicons
9b7690d90c Merge pull request #12633 from Ghommie/Ghommie-cit824 
Few issues, solved.
 2020-06-28 12:53:54 -07:00
silicons
abbbda15ef Merge pull request #12637 from timothyteakettle/fixes-my-dumb-mistakes 
fixes slime blood colour
 2020-06-28 12:53:36 -07:00
Lin
f1aedce87b Merge pull request #12621 from Citadel-Station-13/silicons-patch-6 
fixes a few things with the new Life()
 2020-06-28 13:36:55 -05:00
Timothy Teakettle
d6cfd957ad fix shoes 2020-06-28 17:26:50 +01:00
Ghommie
65ffadaa18 Few issues, solved. 2020-06-28 04:51:02 +02:00
kappa-sama
548fabfb2d viscera cleanup detail 2020-06-27 18:21:22 -04:00
kappa-sama
fec2d1aded someone call the janitor 2020-06-27 18:21:01 -04:00
kappa-sama
bf6a1b3de4 cleanup crew 2020-06-27 18:20:40 -04:00
kappa-sama
5787a75dee node 2020-06-27 18:20:13 -04:00
kappa-sama
d98175d947 decal painter to lathe 2020-06-27 18:19:49 -04:00
Ghom
0d5888daf6 Merge pull request #12628 from Citadel-Station-13/silicons-patch-11 
adds a __nan() proc to fetch a nan number because there's no other way to for debugging
 2020-06-28 00:19:38 +02:00
kappa-sama
61caf7dde2 spraycan 2020-06-27 18:15:20 -04:00
kappa-sama
579727d41d spraycans 2020-06-27 18:14:20 -04:00
kappa-sama
a96bd52c91 airlock painting 2020-06-27 18:13:09 -04:00
silicons
2ab69c0170 Merge pull request #12603 from b1tt3r1n0/Pouches(again) 
Some edits to pouches, and something that can hold sheets.
 2020-06-27 14:54:57 -07:00
silicons
5c10370326 Merge pull request #12601 from Detective-Google/piggyback 
piggyback carrying people is no longer comically slow
 2020-06-27 14:54:44 -07:00
silicons
e51bee9649 Merge pull request #12607 from Detective-Google/cog-2 
cog fixes round 2
 2020-06-27 14:54:31 -07:00
silicons
45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819 
Porting further material datum features and improvements.
 2020-06-27 14:53:28 -07:00
silicons
8b04fd70de Merge pull request #12615 from Ghommie/Ghommie-cit821 
Solving several issues.
 2020-06-27 14:52:59 -07:00
Ghom
58778f2e6e Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck 
slimes blood colour is their body colour
 2020-06-27 22:14:17 +02:00
silicons
0c4e1e7696 Update SDQL_2_wrappers.dm 2020-06-27 07:17:29 -07:00
silicons
30a4bb5683 Update client_procs.dm 2020-06-27 01:20:15 -07:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
silicons
3c4d3791a4 Update life.dm 2020-06-26 17:21:20 -07:00
Timothy Teakettle
9c9868438c some fixes 2020-06-26 22:49:43 +01:00
Timothy Teakettle
334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
silicons
13c2c335f4 Update chat_commands.dm 2020-06-26 10:50:09 -07:00
Ghommie
d1025b10cd mh. 2020-06-26 18:49:20 +02:00
Ghommie
8f6b31c26e Solving several issues. 2020-06-26 18:40:20 +02:00
Detective-Google
8998373241 Update code/modules/mob/living/living_mobility.dm 
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-06-25 19:58:41 -05:00
Detective Google
ea5b155057 lying down now isnt random 2020-06-25 19:39:37 -05:00
Detective Google
5d99f68d8c stinky panda goes in the box 2020-06-25 14:57:41 -05:00