e526f26f46
Merge pull request #10126 from Putnam3145/he-tweaks
...
Makes HE pipes realistically radiate away heat
2019-12-20 13:34:47 +01:00
1748a5ee4b
Merge pull request #10054 from kappa-sama/patch-10
...
autolathe .357 speedloaders->bullets, surplus rifle bullets in hacked lathe
2019-12-20 13:27:35 +01:00
9567d53007
I'm a god. How can you defeat a god? What a grand and intoxicating innocence, how can you be so naive?
2019-12-20 13:24:48 +01:00
61ab3685f1
atmos firelock, changes to temp blocking
2019-12-20 14:14:01 +08:00
6188ec034d
h
2019-12-20 16:10:13 +11:00
0feb54bf70
Update mob.dm
2019-12-19 17:54:01 -07:00
2f78c0a5db
Update mob.dm
2019-12-19 17:51:23 -07:00
8d54e8afcc
Merge pull request #10214 from Ghommie/Ghommie-cit472
...
Brings carbon action intent hotkeys down to living.
2019-12-19 23:42:06 +00:00
138b460af3
Merge pull request #10079 from Ghommie/Ghommie-cit438
...
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
2019-12-19 23:26:53 +00:00
3dc00519fc
Merge pull request #9910 from Ghommie/Ghommie-cit390
...
Unmodularize gamemodes folder.
2019-12-19 23:23:20 +00:00
f3aa363a2e
drop
2019-12-19 17:19:07 -06:00
42d8228c75
Merge pull request #9722 from Ghommie/Ghommie-cit320
...
Umodularize saycode and meat slabs.
2019-12-19 23:03:48 +00:00
66c6659681
Merge pull request #10160 from Ghommie/Ghommie-cit453
...
Ports improved and simplier fire alarms.
2019-12-19 23:00:52 +00:00
c1be6ba222
Merge pull request #10067 from Sishen1542/botnayn
...
You can change a plant's name, description and its seed's description by using a pen on the seed
2019-12-19 16:03:22 -06:00
63dd3487b3
Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
...
the one where the combat medic kit gets buffed
2019-12-19 14:11:27 -06:00
f2b46f0951
ROBUST OPTING MECHANICS
2019-12-19 11:14:02 -08:00
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
871a1aebdc
Hello darkness my old friend.
2019-12-19 13:56:00 +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
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
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
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
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
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
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
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
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
6b8f9427d0
Merge pull request #10153 from Linzolle/fireman-clarity
...
make unable to carry fireman message more clear when unable to carry non-humans
2019-12-17 12:09:08 -08:00
952880eecc
Update drinks.dm
2019-12-17 15:01:23 -05:00
c0e548427b
Merge pull request #10076 from Ghommie/Ghommie-cit437
...
Fixes alien tech node not being unlockable with subtypes of the accepted items.
2019-12-17 11:58:39 -08:00
Ghom