Trilbyspaceclone
|
3dca4dd379
|
Update snacks_frozen.dm
|
2019-07-31 11:35:19 -04:00 |
|
kevinz000
|
66ddaf3ae8
|
Merge pull request #8903 from Trilbyspaceclone/patch-192
Re-words brass flasks to not be wrong
|
2019-07-20 11:59:30 -07:00 |
|
kevinz000
|
70d7ebbb45
|
Merge pull request #8881 from Ghommie/Ghommie-cit134
Fixing a reagent ID typo.
|
2019-07-17 14:44:54 -07:00 |
|
Trilbyspaceclone
|
bc158f4fd8
|
Update code/modules/food_and_drinks/drinks/drinks/bottle.dm
weh
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-07-17 16:39:14 -04:00 |
|
Trilbyspaceclone
|
4c971ea012
|
from afar
|
2019-07-15 22:12:20 -04:00 |
|
Trilbyspaceclone
|
3422dad9ec
|
Update bottle.dm
|
2019-07-15 17:07:53 -04:00 |
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
Ghommie
|
b7c8909a18
|
Fixing a reagent ID typo.
|
2019-07-13 02:12:01 +02:00 |
|
kevinz000
|
280aa9da08
|
Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
Zelus oil - CWC gear
|
2019-07-12 07:41:28 -07:00 |
|
kevinz000
|
c76f6b8a54
|
Merge pull request #8862 from BlackMajor/Burgit-Branch-2
Admin cream pie smite no longer makes its victims fat
|
2019-07-11 04:57:50 -07:00 |
|
Trilbyspaceclone
|
d53d11de6b
|
Apply suggestions from code review
Grammer and such
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-07-10 18:21:03 -04:00 |
|
BlackMajor
|
2717590e9f
|
No more fat smites
|
2019-07-10 21:01:41 +12:00 |
|
TrilbySpaceClone
|
54c28b19af
|
Zelus indeed
|
2019-07-10 02:29:42 -04:00 |
|
deathride58
|
42cee552fe
|
Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
Ports "Fixes every issue in the slimes milestone. #44450"
|
2019-07-08 18:10:46 -04:00 |
|
Ghommie
|
3c2e03c247
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58
|
2019-07-04 23:46:04 +02:00 |
|
kevinz000
|
bce4ce31ab
|
Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-07-03 13:47:04 -07:00 |
|
Ghommie
|
ad3b709c40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
|
2019-06-29 06:39:21 +02:00 |
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02:00 |
|
Ghommie
|
3291b9c47a
|
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-06-28 23:17:12 +02:00 |
|
kevinz000
|
6c77443887
|
Merge pull request #8720 from Ghommie/Ghommie-cit76
Sort of porting MRE rations from Yogstation.
|
2019-06-28 05:28:35 -07:00 |
|
kevinz000
|
f7bbca8918
|
Merge pull request #8731 from Ghommie/Ghommie-cit81
Ports in microwave updates and its radial menu.
|
2019-06-28 05:19:04 -07:00 |
|
deathride58
|
d979dfef59
|
Merge pull request #8738 from Ghommie/Ghommie-cit86
porting pizza fixes.
|
2019-06-28 00:53:23 -04:00 |
|
kevinz000
|
2b50f355d7
|
Merge pull request #8666 from Ghommie/Ghommie-cit60
Fixes roffle waffle, mushroom hallucinogen and some invalid reagents.
|
2019-06-23 06:54:05 -07:00 |
|
kevinz000
|
b33aa0f049
|
Merge pull request #8695 from Ghommie/Ghommie-cit71
Porting smartfridge improvements.
|
2019-06-23 06:53:02 -07:00 |
|
Ghommie
|
13c939ae41
|
porting pizza fixes.
|
2019-06-23 09:07:59 +02:00 |
|
Ghommie
|
2e30b91567
|
Ports in microwave updates and its radial menu.
|
2019-06-23 06:10:49 +02:00 |
|
Ghommie
|
f97a4b3a78
|
changes.
|
2019-06-22 19:50:56 +02:00 |
|
TrilbySpaseClone
|
771ac9724e
|
ports Fel connet
Shamelessly stealing content
|
2019-06-21 04:39:10 -04:00 |
|
Ghommie
|
8a302552f2
|
Ouch really.
|
2019-06-19 06:22:19 +02:00 |
|
Ghommie
|
98367a8b00
|
more.
|
2019-06-19 04:44:59 +02:00 |
|
Ghommie
|
8764d781a3
|
Porting smartfridge improvements.
|
2019-06-19 04:28:36 +02:00 |
|
Ghom
|
95dc8084f1
|
Moving some tablecrafting recipes to the appropriate categories (#8658)
* Moving some recipes to the appropriate categories
* Fixes the not-a-sandwich recipe being M.I.A.
|
2019-06-17 11:18:49 -07:00 |
|
Ghommie
|
1c93c43e20
|
Fixes roffle waffle, mushroom halluginogen and some invalid reagent.
|
2019-06-17 09:16:45 +02:00 |
|
Ghommie
|
519ad202df
|
fixes.
|
2019-06-17 05:19:30 +02:00 |
|
Ghommie
|
1323ace579
|
Peanuts, peanut butter, and sandwiches.
|
2019-06-17 05:17:24 +02:00 |
|
kevinz000
|
5d8286f91c
|
Merge pull request #8640 from Trilbyspaceclone/more_cooking1
Makes baklava pie
|
2019-06-16 01:10:47 -07:00 |
|
deathride58
|
2f47fbdd8b
|
Merge pull request #8628 from BlackMajor/Pie
Cream Pies now transfer a portion of their reagents on hitting someone
|
2019-06-14 19:18:12 -04:00 |
|
TrilbySpaseClone
|
1c45e2c615
|
Suggested
|
2019-06-13 16:02:48 -04:00 |
|
BlackMajor
|
142d62908f
|
Actually make it 15, the pie starts with 13u already used
|
2019-06-12 21:18:56 +12:00 |
|
BlackMajor
|
7b79bbcb29
|
Changes transfer amount to 10u instead of the full 80
|
2019-06-12 21:17:31 +12:00 |
|
BlackMajor
|
90e572ec03
|
Honk
|
2019-06-12 20:03:17 +12:00 |
|
kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
Trilbyspaceclone
|
01e56cc00d
|
garmmer
|
2019-06-06 14:52:52 -04:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
Trilbyspaceclone
|
5e68db7836
|
local files have commas, but I forgot to save
|
2019-06-05 22:22:50 -04:00 |
|
Trilbyspaceclone
|
1b463c18b3
|
Update snacks_sandwichtoast.dm
|
2019-06-05 20:14:48 -04:00 |
|
Trilbyspaceclone
|
a9ded7a3eb
|
Add files via upload
|
2019-06-05 20:10:07 -04:00 |
|
Trilbyspaceclone
|
e5b538af71
|
Update recipes_frozen.dm
|
2019-06-05 20:09:21 -04:00 |
|