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
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
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
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
Hatterhat
accc4ce776
grammar shit, silkstring buff, arrow costs, yikes
2020-02-22 15:33:07 -06: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
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
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
Ghom
8395ee53e7
Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
...
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
2020-02-21 02:47:18 +01:00
Ghom
e92183e968
Merge pull request #10541 from Detective-Google/the-p-o-o-l
...
adds the POOL to box station
2020-02-21 02:43:04 +01:00
Ghom
7763475b83
Merge pull request #10572 from Tupinambis/SiliconDefault
...
Removes harm prevention clause indicators from relevant sources.
2020-02-20 15:33:27 +01:00
Ghom
608bb0a04c
Merge pull request #10649 from kevinz000/hijack
...
Completely reworks the hijack objective, and shuttle hijacking in general
2020-02-20 14:40:08 +01: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
2dd5a0cfb8
Merge branch 'master' into hijack
2020-02-19 22:25:31 -07:00
kevinz000
6f31e1270e
Merge pull request #11098 from Trilbyspaceclone/bows!
...
Silk into clothing, bows, arrows, quivers and more!
2020-02-19 19:05:49 -07:00
kevinz000
a10c71320d
Merge pull request #11117 from Citadel-Station-13/Ghommie-patch-1
...
Makes the mob holder examine less dumb, also indentation.
2020-02-19 19:02:34 -07:00
Arturlang
796f51b557
Merge branch 'master' into TGUI_Next_Nanites
2020-02-20 00:52:55 +02:00
Unknown
c920d198e2
Update Viro to /tg/ standards
2020-02-19 12:17:57 -05: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
Ghom
b028b296f5
Update mob_holder.dm
2020-02-17 12:17:33 +01: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
Ghom
66d5e0e346
Update station.dm
2020-02-17 01:03:29 +01:00
Ghom
3703110dda
Makes the mob holder examine less dumb.
2020-02-16 16:10:20 +01:00
kevinz000
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
kevinz000
b46dd3246d
Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4
...
/datum/element/cleaning cleans your face!
2020-02-15 12:16:39 -07:00
kevinz000
f79148d549
Merge pull request #10947 from Ghommie/Ghommie-cit563
...
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
kevinz000
957c6168b6
Merge pull request #11006 from Ghommie/Ghommie-cit570
...
Something about a couple stack trace issues.
2020-02-15 11:47:30 -07:00
kevinz000
76b5dec4bb
Merge pull request #11040 from Ghommie/Ghommie-cit573
...
Further mob holder fixes.
2020-02-15 11:44:25 -07: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
0a1c3bd084
Merge branch 'master' into Ghommie-cit539
2020-02-14 19:42:36 +01: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
