Putnam
71ac07426a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types
2020-03-06 17:03:24 -08:00
Trilbyspaceclone
c2e56f156f
Update recipes_weapon_and_ammo.dm
2020-03-06 17:18:10 -05:00
kevinz000
29727b2fc9
Merge pull request #11306 from Ghommie/Ghommie-cit598
...
Removes makeshift switchblades
2020-03-06 00:20:36 -07:00
kevinz000
16d6ba9e21
Merge pull request #11323 from Ghommie/Ghommie-cit600
...
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
deathride58
2e35c09dec
Merge pull request #10451 from kevinz000/mobility_flags
...
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghommie
f2c8a7cd6f
Porting a couple material datums code updates and fixes.
2020-03-04 15:59:46 +01:00
kevinz000
5e2414bd90
fix
2020-03-03 22:25:35 -07:00
kevinz000
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
Ghommie
f08d79767b
Removes makeshift switchblades
2020-03-02 19:33:31 +01:00
Putnam
31b9dbd4ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types
2020-02-29 23:30:36 -08:00
Putnam
f344af633f
finalized.
2020-02-29 23:29:24 -08:00
kevinz000
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
Ghommie
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01: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
Winter Flare
4c03d552ee
Gettin Salty. Fish is now Seafood.
2020-02-23 16:22:19 -05:00
Hatterhat
094b92e58b
silk, time, rods
2020-02-23 13:12:25 -06:00
Winter Flare
60b4c10215
Fish Category, Misc Moves
2020-02-22 19:02:43 -05:00
Hatterhat
accc4ce776
grammar shit, silkstring buff, arrow costs, yikes
2020-02-22 15:33:07 -06:00
kevinz000
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07: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
kevinz000
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07: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
kevinz000
ca777c6c8b
Merge pull request #11153 from Ghommie/Ghommie-cit587
...
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-20 06:17:33 -07:00
Ghom
d680ab9fd5
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
...
Ports TGUI Next and a lot of misc updates for nanites.
2020-02-20 11:27:48 +01:00
kevinz000
c7273c03be
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-19 19:12:27 -07:00
Arturlang
796f51b557
Merge branch 'master' into TGUI_Next_Nanites
2020-02-20 00:52:55 +02:00
Ghom
eb342d1591
Update mood.dm
2020-02-19 17:14:30 +01:00
Ghommie
ee1f61b5de
F
2020-02-19 14:26:11 +01:00
Ghommie
057b6f591c
HEEY
2020-02-19 14:23:12 +01:00
Winter Flare
00d66c9b91
Renamed CAT_FISH to CAT_EASTERN
2020-02-18 22:19:58 -05:00
kevinz000
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
Winter Flare
c97111beda
Reorganise Food + Balance Tweaks
...
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
2020-02-17 05:32:03 -05:00
TrilbySpaceClone
a1f1a01a81
grammer and quiver
2020-02-15 00:52:19 -05:00
TrilbySpaceClone
bbe1ddc0cf
silk, bows, and graytide!
2020-02-14 23:04:02 -05:00
Ghom
b0d85c4aea
Merge pull request #11070 from Citadel-Station-13/kevinz000-patch-18
...
ghosts can not force re rendering of storage to a different size
2020-02-14 19:22:05 +01:00
Ghom
64882b8a90
Merge pull request #10993 from Linzolle/bows
...
adds the bow
2020-02-14 08:01:12 +01:00
Linzolle
790b7bf9cc
sanity check
2020-02-13 15:20:01 -06:00
Linzolle
083a6e4c19
runtime?
2020-02-13 13:29:07 -06:00
Linzolle
9a87087378
message unnecessary
2020-02-13 13:26:19 -06:00
Linzolle
f890317810
maybe this will work
2020-02-13 13:02:51 -06:00
Linzolle
d22631700c
update the fucking craft component because artur forgot to
2020-02-13 12:59:56 -06:00
Artur
7964d768fa
Initial Commit
2020-02-13 20:51:52 +02:00
Artur
c01f78b8e8
Conflict fix
2020-02-13 17:52:28 +02:00
Artur
8c37cfef24
Should work now
2020-02-13 15:26:18 +02:00
kevinz000
87097fb059
Update storage.dm
2020-02-13 05:30:44 -07:00
kevinz000
3aa3fc3614
Update storage.dm
2020-02-13 05:15:19 -07:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
Artur
21ce2242ac
Conflict fix
2020-02-12 16:21:29 +02:00
Artur
a9a167b9d3
Suffering and co
2020-02-11 20:18:32 +02:00
Artur
8e50c278bb
Rebuild and misc nuke tweak
2020-02-10 17:34:14 +01:00
