Trilbyspaceclone
cf23018b6a
Update snacks_cake.dm
2020-02-24 22:51:43 -05:00
kevinz000
febb890c7f
Merge pull request #11192 from Putnam3145/supermatter-hardcap
...
Made supermatter power increase with raw damage
2020-02-24 15:12:45 -07:00
Ghom
f86e17d945
Merge pull request #11129 from Owai-Seek/movefood-2-16-20
...
Reorganize Food Recipes, "Balance" Tweaks
2020-02-24 20:53:36 +01:00
Ghom
9355e9319b
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
...
you kids like extend votes?
2020-02-24 16:39:16 +01:00
kevinz000
8cf41997f5
Merge pull request #11201 from Hatterhat/bows
...
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
kevinz000
43c17b4ab3
Merge pull request #11180 from Detective-Google/psych+paramedic
...
Adds epic and also cool paramedics [lazy tg port]
2020-02-24 02:30:36 -07:00
Detective-Google
0caed52ca5
removes the epic and cool access and makes it less epic and more cool
2020-02-24 03:28:33 -06:00
kevinz000
3e77952652
Merge pull request #11216 from Putnam3145/rename-logging
...
[S] Adds rename logging
2020-02-24 02:27:27 -07:00
kevinz000
59074d1174
Merge pull request #11183 from Trilbyspaceclone/patch-291
...
Removes more Trek armor.
2020-02-24 02:27:05 -07:00
kevinz000
4fc0ef5e74
Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N
...
Makes all IPC organs look robotic!
2020-02-24 02:24:06 -07:00
kevinz000
493d62c17e
Merge pull request #11184 from Trilbyspaceclone/patch-292
...
Remember when Kev made IPCs hearts no longer emp? Me ether!
2020-02-24 02:23:45 -07:00
kevinz000
73c03adbbb
Merge pull request #11199 from Detective-Google/pai.pai.pai.png
...
Lets pAIs hold encryption keys and play music.
2020-02-24 02:23:17 -07:00
Putnam
f7e0eb43f8
Adds rename logging
2020-02-23 22:53:20 -08:00
Ghom
565fa77cf9
Merge pull request #11162 from Hatterhat/quickpatch-enzyme
...
biogen enzyme fix, multitool basic tools node fix
2020-02-23 22:48:07 +01:00
Winter Flare
4c03d552ee
Gettin Salty. Fish is now Seafood.
2020-02-23 16:22:19 -05:00
kevinz000
ae42db8674
Merge pull request #11210 from Ghommie/Ghommie-cit588
...
[s] Fixing an issue with slot machines crashing the server.
2020-02-23 06:02:13 -07:00
Ghom
2075147ee9
Merge pull request #11206 from Trilbyspaceclone/patch-294
...
Corn dogs now have a sprite
2020-02-23 13:30:23 +01:00
Ghommie
2b740f9bad
[s] Fixing an issue with slot machines crashing the server.
2020-02-23 13:09:21 +01:00
TrilbySpaceClone
845e719ade
But what if we did it right?
2020-02-23 01:52:36 -05:00
Trilbyspaceclone
2dea3cf15c
Gives ash sandstone
2020-02-23 00:53:42 -05:00
Trilbyspaceclone
342f1cd4c1
Update snacks_meat.dm
2020-02-22 23:17:30 -05:00
Hatterhat
ba81184fef
Merge branch 'master' into quickpatch-enzyme
2020-02-22 18:06:17 -06:00
Winter Flare
60b4c10215
Fish Category, Misc Moves
2020-02-22 19:02:43 -05:00
Hatterhat
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
Ghom
0c558f53d9
Merge pull request #11179 from Trilbyspaceclone/patch-290
...
AIs now understand dwarf
2020-02-22 22:49:08 +01:00
Hatterhat
accc4ce776
grammar shit, silkstring buff, arrow costs, yikes
2020-02-22 15:33:07 -06:00
Ghom
520f5eab83
Merge pull request #11191 from YakumoChen/beelord
...
Beegions
2020-02-22 22:24:20 +01:00
Ghom
6f181365c2
Merge pull request #11172 from Trilbyspaceclone/bows!
...
Bow corrections.
2020-02-22 15:53:27 +01:00
Ghom
b7fab93209
Merge pull request #11186 from Putnam3145/fixed-flavor
...
Fixed temp flavor text (for real)
2020-02-22 15:09:58 +01:00
Putnam
d328d554ba
Reduced copypasta
2020-02-22 02:38:57 -08:00
kevinz000
856af1f182
Merge pull request #10848 from Ghommie/Ghommie-cit229
...
Porting Floyd Materials: Trying again edition
2020-02-21 23:28:44 -07:00
Detective Google
ca29246878
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
2020-02-22 00:02:49 -06:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
Putnam
0f9bda8f90
wow okay make it do this instead
2020-02-21 11:53:16 -08:00
Putnam
8e865a5081
Made power increase with raw damage.
2020-02-21 11:37:17 -08:00
YakumoChen
418374be06
beegion
2020-02-21 17:56:14 +00:00
Ghom
42416483e7
Merge pull request #11175 from keronshb/NaniteFixes
...
Fixes healing nanites
2020-02-21 16:46:19 +01:00
Winter Flare
d112556ea3
Fix, New Category, file renames.
...
Remove Sweets Category
Add Donut Category
Rename recipies_sushi.dm to recipies_eastern_fish.dm (for sorting in the UI)
Rename recipies_pie.dm to recipies_pie_sweets.dm
Remove Onigiri from Misc (It's in Eastern)
2020-02-21 09:34:13 -05:00
Winter Flare
34c8315c2f
I forgot to hit save.
2020-02-21 07:26:32 -05:00
Winter Flare
79967b0ac5
Resolving some convos.
...
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
2020-02-21 07:16:39 -05:00
YakumoChen
2f2ddbad5a
removes density from skulls
2020-02-21 12:07:58 +00:00
YakumoChen
34f1b5d1c8
legion heads now swarm
2020-02-21 10:36:57 +00:00
Putnam
146b2a35f2
fixed temp flavor text (for real)
2020-02-21 00:26:42 -08:00
TrilbySpaceClone
7d8f1320b3
it looks nicer
2020-02-21 03:07:42 -05:00
Trilbyspaceclone
58df6486cb
Hey hey people, grammar here.
2020-02-21 03:06:38 -05:00
Trilbyspaceclone
f35ee95d67
Update heart.dm
2020-02-21 01:54:23 -05:00
Trilbyspaceclone
4542afa537
Update trek.dm
2020-02-21 01:14:09 -05:00
Detective Google
141bd96430
man FUCK psychs
2020-02-20 22:46:37 -06:00
Detective Google
4c10c830bf
Merge remote-tracking branch 'upstream/master' into psych+paramedic
2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901
changes - sprites
2020-02-20 22:17:47 -06:00
