9ec2c8a7f1
MKUltra made double opt-in
2019-12-19 09:54:34 -08:00
a46982efe3
F
2019-12-19 17:40:22 +01:00
fb2b259d92
Ports "Refactors can_see_reagents"
2019-12-19 17:17:18 +01:00
f1154bf840
wew
2019-12-19 16:45:08 +01:00
88978209fa
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly"
2019-12-19 16:42:25 +01:00
17306dbab4
Converts the main timsorts file from relative pathing to absolute pathing.
2019-12-19 16:14:40 +01:00
871a1aebdc
Hello darkness my old friend.
2019-12-19 13:56:00 +01:00
12aa266efe
Missed this one too.
2019-12-19 12:27:30 +01:00
e8e97021b3
Merge pull request #10229 from B1gb3ast/master
...
Fixes nonfunctional code so that tongues can taste strong flavors
2019-12-19 04:06:07 -07:00
23f7815c52
Merge pull request #10204 from r4d6/patch-2
...
Port boops and handshakes
2019-12-19 04:01:52 -07:00
8aca8b8f25
thank you based ghomtainer (when) 2x how did i not notice this
2019-12-19 04:00:37 -07:00
9436d218b4
thank you based ghomtainer (when)
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-19 03:59:57 -07:00
70e8026411
two more PRs.
2019-12-19 11:59:15 +01:00
dcca9eb0d6
Merge pull request #10223 from BlackMajor/Yeehaw
...
Removes Security K9 dogborg. The last of the infinity dogborg removals. (same treatment as the others)
2019-12-19 03:24:36 -07:00
b56d2ff276
Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.
2019-12-19 11:19:00 +01:00
eee52655ef
Update flashbang.dm
2019-12-19 01:57:28 -07:00
e8dc9480b0
AAAAAAAAAAAAAAAAAAAA
2019-12-19 18:30:38 +11:00
d8f0e983f1
lolman acctually knows how the stuff work
2019-12-19 18:24:24 +11:00
8fc095d63e
Update carbon.dm
2019-12-19 17:29:35 +11:00
8566e2396d
Brings in some mapping code updates.
2019-12-19 00:44:14 +01:00
21c77cbdf1
modular man bad.
...
now mörge this so chefs can make delicious dish, hemk.
2019-12-18 23:36:32 +01:00
ba851d55b6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456
2019-12-18 19:42:41 +01:00
d011a7a3d9
oh hey macros.
...
slightly less ugly ™
2019-12-18 19:35:36 +01:00
19b20f8385
im baby dumb and removed "a hint of" by accident.
...
Okay whoops haha there we go now both strong and weak should work.
2019-12-18 19:29:57 +01:00
e546a59214
Magic number man bad, also all heads can spam CC now
2019-12-18 19:29:35 +01:00
7841faa3a9
Actually hold on
...
So that not everything in the game now tastes like STRONG FLAVOUR. That'd be annoying.
2019-12-18 19:24:25 +01:00
f945577655
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320
2019-12-18 19:20:38 +01:00
6df739a045
changes holofan, adds holofirelock
2019-12-19 00:39:29 +08:00
84a413a43a
Chef buffs chef buffs tastier food.
...
"The strong flavor of" was always in game but someone put it behind an else if statement that would never proc.
Now if there's more than 45% (or 30% if you are a lizzard, hissss) of a reagent in a beaker, you will taste a strong flavor!
Hurrah!
2019-12-18 17:37:08 +01:00
114026f9ae
argk
2019-12-18 02:40:51 -08:00
ab4be051c8
pull from src and makes the code better
2019-12-18 15:32:38 +08:00
3dbf813817
probably fixes only neutral traits existing
2019-12-17 22:34:28 -08:00
4e6377e319
no need for this much whitespace
2019-12-17 21:29:48 -08:00
e178db6949
screw it. minimax
2019-12-17 21:29:33 -08:00
fab65a3dbc
actually condorcet not IRV
2019-12-17 20:12:23 -08:00
e3844ee1f9
wups
2019-12-17 21:05:21 -07:00
5a2ef22633
buckle others
2019-12-17 21:03:37 -07:00
cb78fc9188
pai_buckle
2019-12-17 20:58:11 -07:00
fdb4296adc
whew
2019-12-17 20:49:58 -07:00
94b7a48bbc
aaa
2019-12-17 18:29:49 -08:00
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
f25d75fed9
thanks linter
2019-12-17 16:29:24 -08:00
5ef7d9cbf7
why did i not have revs as conversion
2019-12-17 16:09:40 -08:00
04f82f3153
it works
2019-12-17 15:48:28 -08:00
e6e68ae1a3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers
2019-12-17 14:18:19 -08:00
9f21fca798
workin on IRV
2019-12-17 14:18:13 -08:00
8da0ddda1b
oops
2019-12-17 16:40:06 -05:00
17a5fd849e
Update snacks.dm
2019-12-17 15:58:01 -05:00
d6b1b76037
??
2019-12-17 15:28:48 -05:00
ddd3676903
Merge branch 'master' into glassware
2019-12-17 15:18:30 -05:00
Putnam