 Hatterhat
|
6ff7083bfb
|
the one where i buff a 4 tc item, give trilby a (You), and squash my commits
|
2019-12-08 01:29:08 -06:00 |
|
|
Lin
|
24e4673c2b
|
Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
|
2019-12-07 21:49:18 +00:00 |
|
|
Thalpy
|
f59bdbe14e
|
Tweaks botany related ragent pHes so they're less likely to blow up.
|
2019-12-07 17:42:29 +00:00 |
|
|
Thalpy
|
60c555c7e1
|
Merge branch 'master' into Superbases-goodbye
|
2019-12-07 17:37:05 +00:00 |
|
|
Putnam3145
|
cece6dd43d
|
Merge pull request #10098 from Ghommie/Ghommie-cit445
Fixes a lil issue with ice cream cones.
|
2019-12-07 08:48:21 -08:00 |
|
|
Useroth
|
c35acf00fe
|
Empty commit to make travis recompile.
|
2019-12-07 15:18:37 +01:00 |
|
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02:00 |
|
|
Useroth
|
28ddfd29b6
|
Merge branch 'master' into new-tg-plants
|
2019-12-07 14:25:38 +01:00 |
|
|
Ghommie
|
d38475f06d
|
i'm tired of this
|
2019-12-07 12:05:12 +01:00 |
|
|
Trilbyspaceclone
|
bffe3b6da0
|
should be the last fix!
|
2019-12-07 05:21:48 -05:00 |
|
|
Trilbyspaceclone
|
0c82357159
|
Update condiment.dm
|
2019-12-07 05:18:14 -05:00 |
|
|
Trilbyspaceclone
|
f4aca7cf85
|
Update meat.dm
|
2019-12-07 05:17:39 -05:00 |
|
|
kevinz000
|
2e0b019bd7
|
Update utility.dm
|
2019-12-07 03:11:54 -07:00 |
|
|
Trilbyspaceclone
|
c27e507bca
|
Update food_reagents.dm
|
2019-12-07 05:01:12 -05:00 |
|
|
Trilbyspaceclone
|
89b9df23bc
|
le sigh
|
2019-12-07 04:43:58 -05:00 |
|
|
Trilbyspaceclone
|
46ad42708c
|
massive TG sigh
|
2019-12-07 04:42:48 -05:00 |
|
|
Trilbyspaceclone
|
156b7cabb1
|
Update recipes_misc.dm
|
2019-12-07 04:41:28 -05:00 |
|
|
TrilbySpaceClone
|
c9ee29ad02
|
hmm
|
2019-12-07 04:33:42 -05:00 |
|
|
Ghommie
|
19b9cbbb69
|
F
|
2019-12-07 09:58:37 +01:00 |
|
|
kevinz000
|
c706720dd1
|
Merge pull request #9912 from Owai-Seek/cargocleanupv2boogaloo
Added 15+ new crates, fixed issues raised in #9901
|
2019-12-07 01:52:35 -07:00 |
|
|
Trilbyspaceclone
|
7ab66fd2e2
|
no wounder why I didnt push it, it never complied
|
2019-12-07 03:50:20 -05:00 |
|
|
Trilbyspaceclone
|
6faad2e30b
|
Update recipes_misc.dm
|
2019-12-07 03:46:25 -05:00 |
|
|
Ghommie
|
a82e0b9ee5
|
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
|
2019-12-07 09:45:38 +01: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 |
|
|
Ghommie
|
bb83d69aa0
|
Deepfries the trekkie security alert sounds to be three times more annoying, as well as replace the delta alert with the THX Deep Note... actually not.
|
2019-12-07 08:06:30 +01: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 |
|
|
Useroth
|
5f56d40f58
|
Incorporated the bamboo grammar fixes.
|
2019-12-07 06:41:24 +01:00 |
|
|
Ghommie
|
7cc332960b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
|
2019-12-07 05:30:07 +01:00 |
|
|
Ghommie
|
0a0094e80c
|
Fixes stuff I broke with my coding extravaganza.
|
2019-12-07 05:11:29 +01:00 |
|
|
Ghommie
|
9152fe49e6
|
Typo.
|
2019-12-07 04:49:18 +01:00 |
|
|
Ghommie
|
b9751006bb
|
Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
|
2019-12-07 04:46:54 +01:00 |
|
|
nik707
|
e4a41c6169
|
Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
|
2019-12-06 20:37:53 -06:00 |
|
|
Ghommie
|
019ab63e09
|
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
|
2019-12-07 02:06:51 +01:00 |
|
|
Unknown
|
97e686cf23
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-06 17:21:08 -07:00 |
|
|
Ghommie
|
3d42744d8a
|
conflict with a certain framework for tech node discounts or something I guess.
|
2019-12-07 00:38:32 +01:00 |
|
|
Ghommie
|
7cb2092fcb
|
typo
|
2019-12-07 00:04:05 +01:00 |
|
|
Ghommie
|
ae94e1cfbe
|
Fixed alien tech node not being unlockable with subtypes of the accepted items.
|
2019-12-06 23:45:36 +01:00 |
|
|
Artur
|
19ab4a5f70
|
Review fixes and tweaks
|
2019-12-07 00:43:02 +02:00 |
|
|
Ghommie
|
723690bab0
|
Demodularize defib disks and projectiles icons.
|
2019-12-06 23:07:50 +01:00 |
|
|
Useroth
|
1158c03ed7
|
Added bamboo.
|
2019-12-06 19:00:10 +01:00 |
|
|
Ghommie
|
2addcb4142
|
Fixes bubblegum's death not granting the arena shuttle because the medals subsystem is not hub enabled
|
2019-12-06 16:37:46 +01:00 |
|
|
Sishen
|
85b58b3d15
|
Update scripture_applications.dm
|
2019-12-06 07:56:11 -07:00 |
|
|
Sishen
|
f6a64b31b7
|
b
|
2019-12-06 07:02:57 -07:00 |
|
|
Sishen
|
8da7d1a021
|
b
|
2019-12-06 06:38:48 -07:00 |
|
|
Winter Flare
|
6377f1b3a9
|
Organisation
|
2019-12-06 03:42:57 -05:00 |
|
|
kevinz000
|
968e9c099d
|
Update silicon.dm
|
2019-12-06 01:12:44 -07:00 |
|
|
Winter Flare
|
8bd6c58bcd
|
Merge branch 'master' into cargocleanupv2boogaloo
|
2019-12-06 01:27:44 -05:00 |
|
|
Winter Flare
|
b860c6e0bb
|
Merge branch 'master' into cargocleanupv2boogaloo
|
2019-12-06 01:14:44 -05:00 |
|
|
Winter Flare
|
83b77650a8
|
Additional Cleanup
Reorganised Materials, added Bulk Cotton Crate
Removed Wooden Barrel / Toner Crates
Modified Fruit Delux Crate
Modified Cargo Supplies Crate
Moved several crates to their proper areas.
|
2019-12-06 01:13:54 -05:00 |
|
|
Putnam3145
|
4e022af46f
|
Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
|
2019-12-05 21:16:47 -08:00 |
|