Lin
|
37a0f0d7e6
|
Merge pull request #10241 from Ghommie/Ghommie-cit482
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly
|
2019-12-21 22:44:09 +00:00 |
|
Ghom
|
aea2b8865e
|
Merge pull request #10120 from Citadel-Station-13/night_vision
Night vision trait but it just boosts barely-lit visibility
|
2019-12-21 15:30:32 +01:00 |
|
Ghom
|
a384b1782b
|
Merge pull request #10164 from kappa-sama/martialartist
What ho, Muscle Wizard! Might you cast us a spell?
|
2019-12-21 15:24:06 +01:00 |
|
Ghom
|
06cbb381d3
|
Better safe than sorry.
|
2019-12-21 15:17:29 +01:00 |
|
Ghom
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|
Ghom
|
e526f26f46
|
Merge pull request #10126 from Putnam3145/he-tweaks
Makes HE pipes realistically radiate away heat
|
2019-12-20 13:34:47 +01:00 |
|
nik707
|
dd62a9ca87
|
Merge pull request #10084 from Hatterhat/i-dont-test-my-code
i dont make good code
|
2019-12-19 14:10:18 -06:00 |
|
Ghommie
|
88978209fa
|
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly"
|
2019-12-19 16:42:25 +01:00 |
|
Linzolle
|
70e50e57cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-17 20:21:49 -06:00 |
|
Putnam3145
|
b8c5290011
|
Merge pull request #10026 from Linzolle/neck-slice
Neck slice
|
2019-12-17 11:58:00 -08:00 |
|
Ghommie
|
6b7dcbceb0
|
Porting a few martial art code updates.
|
2019-12-17 03:19:07 +01:00 |
|
Lin
|
237fbaa02d
|
Merge pull request #10180 from Ghommie/Ghommie-cit462
[s] virtual reality component improvements, fixes and documentation.
|
2019-12-17 01:05:10 +00:00 |
|
kevinz000
|
e08b5b814f
|
Update lighting.dm
|
2019-12-15 17:04:23 -07:00 |
|
kevinz000
|
745297632d
|
Update lighting.dm
|
2019-12-15 16:59:09 -07:00 |
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
Ghommie
|
80f47872d7
|
My head splodes.
|
2019-12-15 20:31:36 +01:00 |
|
Ghommie
|
081d3df750
|
This is one serious Pepe Silvia complex.
|
2019-12-14 22:52:40 +01:00 |
|
Ghommie
|
e5d45faee8
|
deadchat, not deathchat.
|
2019-12-14 18:53:53 +01:00 |
|
Ghommie
|
3891c91799
|
virtual reality component improvements, fixes and documentation.
|
2019-12-14 17:19:48 +01:00 |
|
Hatterhat
|
44ed639169
|
i should probably write an actual changelog for this
|
2019-12-13 22:16:50 -06:00 |
|
kappa-sama
|
93c4d3c1af
|
martial artists
|
2019-12-12 23:27:12 -05:00 |
|
Putnam3145
|
37ec6037ab
|
LOCALES WERE NEVER A GOOD IDEA
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-10 11:38:29 -08:00 |
|
Putnam3145
|
77d285a1c6
|
Update code/__DEFINES/atmospherics.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-10 07:53:28 -08:00 |
|
Putnam
|
75d8be980a
|
atmos tweaks
|
2019-12-09 02:00:58 -08:00 |
|
kevinz000
|
3e559b6d38
|
Update lighting.dm
|
2019-12-08 19:46:38 -07: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 |
|
Artur
|
9773b530f8
|
More fixes. Urgh
|
2019-12-08 21:47:25 +02:00 |
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02: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 |
|
Hatterhat
|
d1bfe3d840
|
i hate
|
2019-12-06 21:43:15 -06:00 |
|
Artur
|
19ab4a5f70
|
Review fixes and tweaks
|
2019-12-07 00:43:02 +02: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 |
|
kevinz000
|
6a305dfe4f
|
Merge pull request #9955 from Ghommie/Ghommie-cit394
Updating supply pods code.
|
2019-12-05 21:54:42 -07:00 |
|
Putnam3145
|
6b2d3b116d
|
Merge branch 'master' into Ghommie-cit430
|
2019-12-05 20:53:14 -08:00 |
|
kevinz000
|
f937c4d877
|
Merge pull request #10046 from Ghommie/Ghommie-cit424
Ports flag for bespoke elements.
|
2019-12-05 21:50:19 -07:00 |
|
Putnam3145
|
3633c6936d
|
Merge pull request #10052 from Ghommie/Ghommie-cit428
Banishes some "me" emote magic numbers from this realm.
|
2019-12-05 20:47:39 -08:00 |
|
kevinz000
|
5048995a58
|
Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
|
2019-12-05 21:44:25 -07:00 |
|
kevinz000
|
29497320c1
|
Merge pull request #10025 from Linzolle/butchering
refactor butchering component
|
2019-12-05 21:19:57 -07:00 |
|
Ghommie
|
5024e900f7
|
Ooow fuck.
|
2019-12-06 02:45:55 +01:00 |
|
Ghommie
|
9ca7bb759c
|
Ports "Slightly improves visible and audible messages."
|
2019-12-06 02:02:12 +01:00 |
|
Ghommie
|
7958cfa548
|
Right file
|
2019-12-06 00:27:50 +01:00 |
|
BlackMajor
|
a6f48ea74c
|
Merge pull request #9372 from Weblure/Xenobio-Hotkeys
[Ready] [Test Merge] Ports Xenobio Hotkeys
|
2019-12-06 11:29:34 +13:00 |
|
Ghommie
|
53ff425f04
|
Banishes some magic numbers from this realm.
|
2019-12-05 21:55:28 +01:00 |
|
Artur
|
82d1497ddc
|
Fixes bad buds and toxin healing
|
2019-12-05 17:29:00 +02:00 |
|
Ghommie
|
07bd51f79a
|
Ports flag for bespoke elements.
|
2019-12-04 19:38:25 +01:00 |
|
Ghommie
|
8615c0ea8f
|
Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394
|
2019-12-03 02:32:59 +01:00 |
|
Putnam3145
|
8da17c5aaf
|
Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
|
2019-12-01 23:12:35 -08:00 |
|
Linzolle
|
ce04739ccb
|
neck slice
|
2019-12-01 15:53:40 -06:00 |
|
Linzolle
|
19b004edab
|
update butchering
|
2019-12-01 14:35:11 -06:00 |
|
Artur
|
f48d8016d5
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-01 13:51:57 +02:00 |
|