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
1e2a4f606c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-08 14:17:00 -06:00
379a01c3fe
packin some more doo dee doo
2019-12-08 01:42:56 -06:00
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
e5c8f7bf06
Merge branch 'master' into glassware
2019-12-07 12:50:32 -05:00
f59bdbe14e
Tweaks botany related ragent pHes so they're less likely to blow up.
2019-12-07 17:42:29 +00:00
60c555c7e1
Merge branch 'master' into Superbases-goodbye
2019-12-07 17:37:05 +00:00
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +02:00
bffe3b6da0
should be the last fix!
2019-12-07 05:21:48 -05:00
c27e507bca
Update food_reagents.dm
2019-12-07 05:01:12 -05:00
89b9df23bc
le sigh
2019-12-07 04:43:58 -05:00
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
19ab4a5f70
Review fixes and tweaks
2019-12-07 00:43:02 +02:00
542c9007ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-06 20:09:35 +01:00
72c093d14e
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2019-12-06 19:05:50 +01:00
91e628c73d
Ports timestop and sepia extracts improvements/tweaks.
2019-12-06 19:01:42 +01:00
54be35a243
Merge pull request #9997 from Sishen1542/nuked
...
removes superspeed from nuka cola
2019-12-05 21:48:34 -07:00
176bde7829
Merge pull request #9990 from Linzolle/strange-reagent
...
Fixes to strange reagent and very slight nerf I guess.
2019-12-05 21:45:09 -07:00
238655d599
Fixes eyes blindness a little.
2019-12-06 00:10:50 +01:00
b7d0cc6516
Merge pull request #9884 from Useroth/blackpowder-alternative
...
Black powder fix. Alternative to #9861
2019-12-06 11:32:17 +13:00
af4eaf7f0f
Fixeesss
2019-12-03 23:09:11 +02:00
8d09f5a082
Merge branch 'master' into tinytweaks
2019-12-01 23:24:56 -08:00
82ab55453b
Apply suggestions from code review
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-12-01 20:57:13 -05:00
aaf9f12e11
Merge pull request #9981 from Ghommie/Ghommie-cit407
...
Rags are no longer transparent reagent containers. Also allows squeezing their reagents into another container.
2019-11-30 22:44:06 -08:00
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
4863deb978
blood ratio
2019-11-29 12:59:25 -06:00
69e11e4203
olllll
2019-11-28 23:01:15 -07:00
3a1e4dec5a
Revert "lol"
...
This reverts commit 7f6a1a6fda
2019-11-28 23:00:13 -07:00
7f6a1a6fda
lol
2019-11-28 22:53:39 -07:00
66971236d5
when you forget to hit ctrl+S
2019-11-28 21:02:28 -06:00
a940110dee
spawn instead of sleep
2019-11-28 20:51:50 -06:00
e3439f96f0
strange reagent fix
2019-11-28 18:06:18 -06:00
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
c8d3856d73
Sanity
2019-11-28 20:34:41 +01:00
f2d6e6b78f
Allows people to squeeze it into another container.
2019-11-28 20:31:30 +01:00
9bef7edd0f
Rags are no longer transparent reagent containers.
2019-11-28 19:59:34 +01:00
ccfdb74508
Merge pull request #9882 from FestiveBall/Fersi
...
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2019-11-26 16:02:42 -07:00
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
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06:00
79a64d9c63
Makes synthtissue a lil easier.
2019-11-25 03:36:39 +00:00
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
614a462176
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
...
This reverts commit 1509d9d183
2019-11-24 03:33:02 +00:00
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
1509d9d183
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit 135608551fce7e9ac452
2019-11-24 03:04:13 +00:00
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
9eaed4ea8e
Revert "pls2"
...
This reverts commit 0eb635b908
2019-11-24 03:02:04 +00:00
Ghommie