 Ghommie
|
187b9bb13a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483
|
2019-12-23 05:10:38 +01:00 |
|
|
Ghommie
|
d88f50ac15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-23 05:02:31 +01:00 |
|
|
Ghommie
|
b75349bebf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 04:32:09 +01:00 |
|
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
|
LinandGitHub
|
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 |
|
|
GhomandGitHub
|
31ba9fe4a8
|
Revert "Makes HE pipes realistically radiate away heat"
|
2019-12-21 22:43:26 +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 |
|
|
Putnam
|
128b857d99
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers
|
2019-12-21 08:31:44 -08:00 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
GhomandGitHub
|
06cbb381d3
|
Better safe than sorry.
|
2019-12-21 15:17:29 +01:00 |
|
|
GhomandGitHub
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|
|
Putnam
|
758e66ac2d
|
yeah alcohol intolerance
|
2019-12-20 16:46:38 -08:00 |
|
|
Putnam
|
c810145fc1
|
also adds aphrodisiacs, slaps, all hypno as prefs
|
2019-12-20 14:47:09 -08:00 |
|
|
Ghommie
|
9db79ff958
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-20 23:40:21 +01:00 |
|
|
GhomandGitHub
|
e526f26f46
|
Merge pull request #10126 from Putnam3145/he-tweaks
Makes HE pipes realistically radiate away heat
|
2019-12-20 13:34:47 +01:00 |
|
|
nik707andGitHub
|
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 |
|
|
Putnam
|
f2b46f0951
|
ROBUST OPTING MECHANICS
|
2019-12-19 11:14:02 -08:00 |
|
|
Putnam
|
9ec2c8a7f1
|
MKUltra made double opt-in
|
2019-12-19 09:54:34 -08:00 |
|
|
Ghommie
|
fb2b259d92
|
Ports "Refactors can_see_reagents"
|
2019-12-19 17:17:18 +01:00 |
|
|
Ghommie
|
88978209fa
|
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly"
|
2019-12-19 16:42:25 +01:00 |
|
|
Ghommie
|
12aa266efe
|
Missed this one too.
|
2019-12-19 12:27:30 +01:00 |
|
|
Ghommie
|
8566e2396d
|
Brings in some mapping code updates.
|
2019-12-19 00:44:14 +01:00 |
|
|
Putnam
|
fab65a3dbc
|
actually condorcet not IRV
|
2019-12-17 20:12:23 -08: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 |
|
|
Putnam
|
04f82f3153
|
it works
|
2019-12-17 15:48:28 -08:00 |
|
|
Putnam
|
e6e68ae1a3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers
|
2019-12-17 14:18:19 -08:00 |
|
|
Putnam
|
9f21fca798
|
workin on IRV
|
2019-12-17 14:18:13 -08:00 |
|
|
TrilbyspacecloneandGitHub
|
0f5c8db456
|
Merge branch 'master' into donut
|
2019-12-17 15:12:51 -05:00 |
|
|
Putnam3145andGitHub
|
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 |
|
|
LinandGitHub
|
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 |
|
|
Ghommie
|
80402a0d88
|
Ports some hud and update_icon code updates.
|
2019-12-16 23:29:20 +01:00 |
|
|
kevinz000andGitHub
|
e08b5b814f
|
Update lighting.dm
|
2019-12-15 17:04:23 -07:00 |
|
|
kevinz000andGitHub
|
745297632d
|
Update lighting.dm
|
2019-12-15 16:59:09 -07:00 |
|
|
Putnam3145andGitHub
|
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 |
|
|
kevinz000
|
4970675467
|
s
|
2019-12-15 00:06:11 -07: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 |
|
|
Ghommie
|
7d7bcc7c34
|
Fixes and ready up.
|
2019-12-13 02:30:21 +01:00 |
|
|
Ghommie
|
8ec4bdaef5
|
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2019-12-13 02:30:11 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
kevinz000andGitHub
|
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 |
|