 GhomandGitHub
|
fdff70b702
|
Merge pull request #10256 from Putnam3145/alcohol-intolerance
Adds an alcohol intolerance trait (NOT light drinker)
|
2020-01-05 15:19:48 +01:00 |
|
|
GhomandGitHub
|
0e74c94d8c
|
Merge pull request #10278 from Trilbyspaceclone/patch-248
Fixes Fermi plushie reaction. Removes carbonation of caramel
|
2020-01-05 15:17:14 +01:00 |
|
|
GhomandGitHub
|
ca8d93ad17
|
Merge branch 'master' into alcohol-intolerance
|
2020-01-04 23:17:55 +01:00 |
|
|
Hatterhat
|
1195762f86
|
space cola isnt a reagent idiot
|
2020-01-01 20:37:09 -06:00 |
|
|
Seris02andGitHub
|
8bb7a4a40d
|
hnnnng
|
2019-12-30 19:24:07 +08:00 |
|
|
Seris02andGitHub
|
bc2e4f3b5a
|
desc
|
2019-12-30 19:08:37 +08:00 |
|
|
Seris02
|
40730b48d5
|
few fixes
|
2019-12-30 11:49:16 +08:00 |
|
|
Seris02
|
a39c0249c4
|
marshmallow
|
2019-12-29 21:55:25 +08:00 |
|
|
LinandGitHub
|
d562a5ba27
|
Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
|
2019-12-28 04:07:03 +00:00 |
|
|
TrilbyspacecloneandGitHub
|
ceeab2db39
|
no longer carbon burning
|
2019-12-23 21:00:29 -05:00 |
|
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
|
GhomandGitHub
|
a33065a728
|
Merge pull request #10190 from Trilbyspaceclone/honeysoda
The new buzz around the new soft drink
|
2019-12-21 18:34:35 +01:00 |
|
|
Ghommie
|
395457f7ef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
|
2019-12-21 17:59:32 +01:00 |
|
|
GhomandGitHub
|
a7cda1aea0
|
Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
|
2019-12-21 11:05:36 +01:00 |
|
|
Putnam
|
758e66ac2d
|
yeah alcohol intolerance
|
2019-12-20 16:46:38 -08:00 |
|
|
Ghommie
|
f945577655
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320
|
2019-12-18 19:20:38 +01:00 |
|
|
TrilbyspacecloneandGitHub
|
17a5fd849e
|
Update snacks.dm
|
2019-12-17 15:58:01 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
d6b1b76037
|
??
|
2019-12-17 15:28:48 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
0f5c8db456
|
Merge branch 'master' into donut
|
2019-12-17 15:12:51 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
952880eecc
|
Update drinks.dm
|
2019-12-17 15:01:23 -05:00 |
|
|
Ghommie
|
80402a0d88
|
Ports some hud and update_icon code updates.
|
2019-12-16 23:29:20 +01:00 |
|
|
Ghommie
|
0a4a2acbab
|
fixing double-flavour ice creams.
|
2019-12-16 00:00:58 +01:00 |
|
|
TrilbyspacecloneandGitHub
|
b41eb4426e
|
there's
|
2019-12-15 02:38:38 -05:00 |
|
|
TrilbySpaceClone
|
5febc54fb8
|
whats all the buzz around this new drink?
|
2019-12-15 01:13:15 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
285833c8d3
|
Runtime fix
|
2019-12-12 21:51:50 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
658e050b1f
|
Ghommie correction
|
2019-12-12 21:47:54 -05:00 |
|
|
|
e6282e95c2
|
Apply suggestions from code review
Ghommie fixes
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-12 21:46:31 -05:00 |
|
|
Ghommie
|
414d4b7a90
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
|
2019-12-09 00:04:22 +01:00 |
|
|
Ghommie
|
d38475f06d
|
i'm tired of this
|
2019-12-07 12:05:12 +01:00 |
|
|
TrilbyspacecloneandGitHub
|
0c82357159
|
Update condiment.dm
|
2019-12-07 05:18:14 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
f4aca7cf85
|
Update meat.dm
|
2019-12-07 05:17:39 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
46ad42708c
|
massive TG sigh
|
2019-12-07 04:42:48 -05:00 |
|
|
TrilbySpaceClone
|
c9ee29ad02
|
hmm
|
2019-12-07 04:33:42 -05:00 |
|
|
TrilbySpaceClone
|
025a7cd79a
|
more ports
https://github.com/tgstation/tgstation/pull/46924
https://github.com/tgstation/tgstation/pull/48050
|
2019-12-07 03:04:02 -05:00 |
|
|
TrilbySpaceClone
|
c4450579ac
|
Why does breakfast have a timer?
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
|
2019-12-07 01:53:55 -05:00 |
|
|
Ghommie
|
53ff425f04
|
Banishes some magic numbers from this realm.
|
2019-12-05 21:55:28 +01:00 |
|
|
Putnam3145andGitHub
|
44c621e5e9
|
Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
|
2019-11-30 22:22:52 -08:00 |
|
|
kevinz000andGitHub
|
521fdec59b
|
Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
|
2019-11-28 23:11:57 -07:00 |
|
|
Ghommie
|
3b8aebbbc2
|
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-11-29 00:40:16 +01:00 |
|
|
GrayRachnid
|
b6df1126bb
|
Can't I make a PR without having to make 2 commits to fix my mistakes oh my god
|
2019-11-27 22:52:21 -05:00 |
|
|
GrayRachnid
|
ad6684380c
|
You can now stack stuff pretty high
|
2019-11-27 18:39:11 -05:00 |
|
|
lolman360andGitHub
|
dc1c17226d
|
Merge branch 'master' into HeadCorgi
|
2019-11-28 08:45:19 +11:00 |
|
|
Ghommie
|
252c37f421
|
whops 2
|
2019-11-27 08:31:21 +01:00 |
|
|
Ghommie
|
b432ec4f33
|
Whops
|
2019-11-27 08:25:13 +01:00 |
|
|
Ghommie
|
a89eccbac5
|
Ports custom reagent icecreams, plus some fixes.
|
2019-11-27 08:16:17 +01:00 |
|
|
kevinz000andGitHub
|
6b53845f06
|
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
|
2019-11-26 16:01:48 -07:00 |
|
|
FermiandFermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
|
FermiandFermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
|
FermiandFermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
|
FermiandFermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|