4c03d552ee
Gettin Salty. Fish is now Seafood.
2020-02-23 16:22:19 -05:00
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
2075147ee9
Merge pull request #11206 from Trilbyspaceclone/patch-294
...
Corn dogs now have a sprite
2020-02-23 13:30:23 +01:00
2b740f9bad
[s] Fixing an issue with slot machines crashing the server.
2020-02-23 13:09:21 +01:00
845e719ade
But what if we did it right?
2020-02-23 01:52:36 -05:00
2dea3cf15c
Gives ash sandstone
2020-02-23 00:53:42 -05:00
342f1cd4c1
Update snacks_meat.dm
2020-02-22 23:17:30 -05:00
ba81184fef
Merge branch 'master' into quickpatch-enzyme
2020-02-22 18:06:17 -06:00
2cd8adf4da
Update medical_designs.dm
2020-02-22 19:06:11 -05:00
60b4c10215
Fish Category, Misc Moves
2020-02-22 19:02:43 -05:00
cf8b41723d
Update medical_designs.dm
2020-02-22 18:35:40 -05:00
c638a83e23
Merge branch 'master' into more_implants
2020-02-22 18:34:02 -05:00
becdd3c4c1
Merge branch 'master' into more_crates+bags
2020-02-22 18:33:26 -05:00
511692a7cb
Update medical_designs.dm
2020-02-22 18:30:32 -05:00
18bfde5a0a
Update augments_arms.dm
2020-02-22 17:58:50 -05:00
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
0c558f53d9
Merge pull request #11179 from Trilbyspaceclone/patch-290
...
AIs now understand dwarf
2020-02-22 22:49:08 +01:00
99475488d3
mistake
2020-02-22 15:45:06 -06:00
accc4ce776
grammar shit, silkstring buff, arrow costs, yikes
2020-02-22 15:33:07 -06:00
520f5eab83
Merge pull request #11191 from YakumoChen/beelord
...
Beegions
2020-02-22 22:24:20 +01:00
6f181365c2
Merge pull request #11172 from Trilbyspaceclone/bows!
...
Bow corrections.
2020-02-22 15:53:27 +01:00
b7fab93209
Merge pull request #11186 from Putnam3145/fixed-flavor
...
Fixed temp flavor text (for real)
2020-02-22 15:09:58 +01:00
59acbe0125
yee
2020-02-22 20:45:16 +08:00
c3ec44b0d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-02-22 19:54:10 +08:00
84d08fe122
firebreath change + update to tg genetics + calc patch
2020-02-22 19:42:33 +08:00
d328d554ba
Reduced copypasta
2020-02-22 02:38:57 -08:00
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
b8d60a33bd
partial fix
2020-02-21 23:29:13 -07:00
856af1f182
Merge pull request #10848 from Ghommie/Ghommie-cit229
...
Porting Floyd Materials: Trying again edition
2020-02-21 23:28:44 -07:00
ca29246878
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
2020-02-22 00:02:49 -06:00
5a580dda20
Update suppression.dm
2020-02-21 18:18:37 -07:00
24ba8b4d04
Update haste.dm
2020-02-21 18:17:54 -07:00
f2a17b8b35
Update robot_mobility.dm
2020-02-21 18:17:07 -07:00
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
665e95d827
compile
2020-02-21 15:03:22 -07:00
e85699df50
compile fix
2020-02-21 14:18:45 -07:00
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
9d414bd5a7
Yikes my bad
2020-02-21 15:29:56 -05:00
9578c69f77
Update hivelord.dm
2020-02-21 15:24:27 -05:00
0f9bda8f90
wow okay make it do this instead
2020-02-21 11:53:16 -08:00
8e865a5081
Made power increase with raw damage.
2020-02-21 11:37:17 -08:00
418374be06
beegion
2020-02-21 17:56:14 +00:00
42416483e7
Merge pull request #11175 from keronshb/NaniteFixes
...
Fixes healing nanites
2020-02-21 16:46:19 +01:00
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
e08c89ce48
Reverts some
2020-02-21 15:10:39 +02:00
34c8315c2f
I forgot to hit save.
2020-02-21 07:26:32 -05:00
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
2f2ddbad5a
removes density from skulls
2020-02-21 12:07:58 +00:00
34f1b5d1c8
legion heads now swarm
2020-02-21 10:36:57 +00:00
146b2a35f2
fixed temp flavor text (for real)
2020-02-21 00:26:42 -08:00
Winter Flare