 Putnam3145
|
ed44b3130c
|
Merge pull request #10172 from Ghommie/Ghommie-cit460
Porting several quirks code updates.
|
2019-12-17 11:51:03 -08:00 |
|
|
Trilbyspaceclone
|
47df4f452d
|
Update drink_reagents.dm
|
2019-12-17 14:26:21 -05:00 |
|
|
Lin
|
6f70ba1477
|
Merge pull request #10181 from Ghommie/Ghommie-cit463
Fixing a few pill bottle issues with the ChemMaster.
|
2019-12-17 01:08:27 +00:00 |
|
|
Ghommie
|
5bf252a58c
|
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2019-12-17 01:57:56 +01:00 |
|
|
Trilbyspaceclone
|
c036c2c835
|
Update drink_reagents.dm
|
2019-12-16 19:05:16 -05:00 |
|
|
Ghommie
|
843f4ed0da
|
FLAK
|
2019-12-16 02:44:58 +01:00 |
|
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
|
Ghommie
|
d3d1f8328f
|
compiles now.
|
2019-12-15 22:16:02 +01:00 |
|
|
Trilbyspaceclone
|
499c2a30e7
|
corrections for .4 metaballic rate
|
2019-12-15 13:59:54 -05:00 |
|
|
TrilbySpaceClone
|
5febc54fb8
|
whats all the buzz around this new drink?
|
2019-12-15 01:13:15 -05:00 |
|
|
Ghommie
|
12b87b4f3d
|
Better.
|
2019-12-14 19:29:51 +01:00 |
|
|
Ghommie
|
2ccfaf38fb
|
consistency.
|
2019-12-14 19:27:39 +01:00 |
|
|
Ghommie
|
6117434c7f
|
Ok
|
2019-12-14 19:24:43 +01:00 |
|
|
Ghommie
|
70252d2914
|
Fixing a few pill bottle issues with the ChemMaster.
|
2019-12-14 19:20:02 +01:00 |
|
|
Hatterhat
|
a1cc129d0b
|
slightly better storage, cucks the surgery duffel
|
2019-12-13 21:10:12 -06:00 |
|
|
Artur
|
9faf3d1dac
|
Mooaar fixeees
|
2019-12-14 01:01:38 +02:00 |
|
|
Ghommie
|
b39ae815f3
|
Porting several quirks code updates.
|
2019-12-13 16:12:04 +01:00 |
|
|
Lin
|
9ec8458803
|
Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-12-10 23:52:31 +00:00 |
|
|
Putnam3145
|
beddaa1a99
|
Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
|
2019-12-09 12:40:37 -08: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 |
|
|
Linzolle
|
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 |
|
|
Hatterhat
|
379a01c3fe
|
packin some more doo dee doo
|
2019-12-08 01:42:56 -06:00 |
|
|
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 |
|
|
TrilbySpaceClone
|
e5c8f7bf06
|
Merge branch 'master' into glassware
|
2019-12-07 12:50:32 -05: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 |
|
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02:00 |
|
|
Trilbyspaceclone
|
bffe3b6da0
|
should be the last fix!
|
2019-12-07 05:21:48 -05: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
|
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 |
|
|
Artur
|
19ab4a5f70
|
Review fixes and tweaks
|
2019-12-07 00:43:02 +02:00 |
|
|
Ghommie
|
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 |
|
|
Ghommie
|
72c093d14e
|
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
|
2019-12-06 19:05:50 +01:00 |
|
|
Ghommie
|
91e628c73d
|
Ports timestop and sepia extracts improvements/tweaks.
|
2019-12-06 19:01:42 +01:00 |
|
|
kevinz000
|
54be35a243
|
Merge pull request #9997 from Sishen1542/nuked
removes superspeed from nuka cola
|
2019-12-05 21:48:34 -07:00 |
|
|
kevinz000
|
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 |
|
|
Ghommie
|
238655d599
|
Fixes eyes blindness a little.
|
2019-12-06 00:10:50 +01:00 |
|
|
BlackMajor
|
b7d0cc6516
|
Merge pull request #9884 from Useroth/blackpowder-alternative
Black powder fix. Alternative to #9861
|
2019-12-06 11:32:17 +13:00 |
|
|
Artur
|
af4eaf7f0f
|
Fixeesss
|
2019-12-03 23:09:11 +02:00 |
|
|
Putnam3145
|
8d09f5a082
|
Merge branch 'master' into tinytweaks
|
2019-12-01 23:24:56 -08:00 |
|
|
Trilbyspaceclone
|
82ab55453b
|
Apply suggestions from code review
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
|
2019-12-01 20:57:13 -05:00 |
|
|
Putnam3145
|
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 |
|
|
Putnam3145
|
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 |
|
|
Linzolle
|
4863deb978
|
blood ratio
|
2019-11-29 12:59:25 -06:00 |
|
|
Sishen
|
69e11e4203
|
olllll
|
2019-11-28 23:01:15 -07:00 |
|
|
Sishen
|
3a1e4dec5a
|
Revert "lol"
This reverts commit 7f6a1a6fda.
|
2019-11-28 23:00:13 -07:00 |
|
|
Sishen
|
7f6a1a6fda
|
lol
|
2019-11-28 22:53:39 -07:00 |
|
|
Linzolle
|
66971236d5
|
when you forget to hit ctrl+S
|
2019-11-28 21:02:28 -06:00 |
|
|
Linzolle
|
a940110dee
|
spawn instead of sleep
|
2019-11-28 20:51:50 -06:00 |
|