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
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
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
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
b8c5290011
Merge pull request #10026 from Linzolle/neck-slice
...
Neck slice
2019-12-17 11:58:00 -08:00
ed44b3130c
Merge pull request #10172 from Ghommie/Ghommie-cit460
...
Porting several quirks code updates.
2019-12-17 11:51:03 -08:00
7017ab243b
Merge pull request #10216 from Ghommie/Ghommie-cit474
...
Porting a few martial art code updates.
2019-12-17 11:47:19 -08:00
37cfec22aa
Merge pull request #10066 from Sishen1542/aaaaaaaa
...
neovgre qol changes
2019-12-17 11:40:43 -08:00
7a6541936c
Merge pull request #10111 from kappa-sama/patch-11
...
send help please, or how i vowed to kill kevinz (you can now strip people while aggrograbbing)
2019-12-17 11:38:35 -08:00
0adcb900c1
Merge pull request #10155 from Seris02/windowfix
...
adds some distance checks to some things
2019-12-17 11:34:13 -08:00
634154e7cf
Merge pull request #10157 from Ghommie/Ghommie-cit452
...
Ports "Fixes powernet avail checks"
2019-12-17 11:33:33 -08:00
670141edf7
Merge pull request #10209 from Ghommie/Ghommie-cit470
...
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-17 11:26:36 -08:00
5945f30523
Merge pull request #10225 from Ghommie/Ghommie-cit475
...
Two slimepeople fixes.
2019-12-17 11:22:30 -08:00
95c0eddc2a
Merge pull request #10072 from Useroth/new-tg-plants
...
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
f2cf146255
Two slimepeople fixes.
2019-12-17 12:49:04 +01:00
6b7dcbceb0
Porting a few martial art code updates.
2019-12-17 03:19:07 +01:00
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
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
6365a430cc
Merge pull request #10208 from Ghommie/Ghommie-cit469
...
Fixes AI being unable to talk through the holopad.
2019-12-16 10:57:26 -08:00
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
9c5a66af67
Fixes AI being unable to talk through the holopad.
2019-12-16 15:58:10 +01:00
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
ba7a3f5fd2
Merge pull request #9971 from Xantholne/xantholne-christmas01
...
Adds the Christmas Clothes you never knew you wanted.
2019-12-15 20:11:09 -07:00
843f4ed0da
FLAK
2019-12-16 02:44:58 +01:00
74cc1ec547
Merge pull request #10177 from BlackMajor/FIST
...
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
ad88481f3e
OwO whats this notices your
2019-12-15 16:45:34 -07:00
363380405e
Merge pull request #10198 from Ghommie/Ghommie-cit466
...
Fixes ranged syndicate mobs stormtrooper training: The port.
2019-12-15 15:42:13 -08:00
7aa454dbbb
Merge pull request #10197 from Ghommie/Ghommie-cit465
...
fixing double-flavour (and bland custom) ice creams.
2019-12-15 15:24:17 -08:00
22aba489e3
Fixes ranged syndicate mobs stormtrooper training: The port.
2019-12-16 00:21:28 +01:00
008c4ef822
according to all known laws of aviation
2019-12-15 16:18:42 -07:00
9bfba1d1d9
Merge branch 'master' into xantholne-christmas01
2019-12-15 16:14:37 -07:00
0a4a2acbab
fixing double-flavour ice creams.
2019-12-16 00:00:58 +01:00
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
f8a05b5ae1
perhaps
2019-12-15 17:31:49 -05:00
58f4f58cd2
Slaughter demons shouldnt bleed
2019-12-16 00:05:51 +02:00
d3d1f8328f
compiles now.
2019-12-15 22:16:02 +01:00
80f47872d7
My head splodes.
2019-12-15 20:31:36 +01:00
4b177c4956
Adjusted NF balance
2019-12-16 01:20:14 +13:00
2e9503f6d7
Merge pull request #10166 from Ghommie/Ghommie-cit457
...
Ports "Roundstart borg brains no longer decay."
2019-12-14 20:37:57 -08:00
cce63507d1
Merge pull request #9970 from Ghommie/Ghommie-cit402
...
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
2019-12-15 00:16:34 +00:00
73abc2ae40
Merge branch 'master' into xantholne-christmas01
2019-12-14 17:15:00 -07:00
49c37641a7
Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124
...
nerfs factorio (conveyors can no longer stack more than 150 items on one tile)
2019-12-15 00:04:58 +00:00
1f852ea92a
Merge pull request #10150 from Trilbyspaceclone/patch-245
...
Corrects telegram hat icon, adds a new dog fashion to telegram hat
2019-12-15 00:02:57 +00:00
081d3df750
This is one serious Pepe Silvia complex.
2019-12-14 22:52:40 +01:00
bd1040ab60
Merge pull request #10171 from r4d6/patch-1
...
Who the fuck put 10 shielding when you need 9?
2019-12-14 11:04:37 -08:00
12b87b4f3d
Better.
2019-12-14 19:29:51 +01:00
2ccfaf38fb
consistency.
2019-12-14 19:27:39 +01:00
6117434c7f
Ok
2019-12-14 19:24:43 +01:00
B1gb3ast