d28811fe89
Automatic changelog generation for PR #10054 [ci skip]
2019-12-20 06:27:50 -06: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
fa11979355
Automatic changelog generation for PR #10193 [ci skip]
2019-12-20 06:15:57 -06:00
481371bca7
Merge pull request #10193 from Commandersand/yeet
...
gamer is now filtered for clowns
2019-12-20 13:15:54 +01:00
4d466e17f3
Merge pull request #10173 from Ghommie/Ghommie-cit461
...
Fixing a boxstation pipenet mapping issue.
2019-12-19 23:43:16 +00:00
702aff08c4
Automatic changelog generation for PR #10214 [ci skip]
2019-12-19 17:42:09 -06: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
1e7e66b8c5
Automatic changelog generation for PR #10207 [ci skip]
2019-12-19 17:41:40 -06:00
f38747ed70
Merge pull request #10207 from Ghommie/Ghommie-cit468
...
Fixes pubby wall meds being var-edited snowflakes.
2019-12-19 23:41:36 +00:00
8511c44f0f
Merge pull request #10199 from Ghommie/Ghommie-cit467
...
Fixing and cleaning up the blood bank generator code.
2019-12-19 23:39:17 +00:00
d9002bbe8b
Automatic changelog generation for PR #10079 [ci skip]
2019-12-19 17:26:56 -06: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
42d8228c75
Merge pull request #9722 from Ghommie/Ghommie-cit320
...
Umodularize saycode and meat slabs.
2019-12-19 23:03:48 +00:00
73a0976d4e
Automatic changelog generation for PR #10160 [ci skip]
2019-12-19 17:00:55 -06:00
66c6659681
Merge pull request #10160 from Ghommie/Ghommie-cit453
...
Ports improved and simplier fire alarms.
2019-12-19 23:00:52 +00:00
53abbbaf85
Automatic changelog generation for PR #10067 [ci skip]
2019-12-19 16:03:25 -06: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
f4cbc986da
Automatic changelog generation for PR #10090 [ci skip]
2019-12-19 14:11:30 -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
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
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
06b38d0263
Automatic changelog generation for PR #10204 [ci skip]
2019-12-19 05:01:55 -06:00
23f7815c52
Merge pull request #10204 from r4d6/patch-2
...
Port boops and handshakes
2019-12-19 04:01:52 -07: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
21c77cbdf1
modular man bad.
...
now mörge this so chefs can make delicious dish, hemk.
2019-12-18 23:36:32 +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
5be981e026
Automatic changelog generation for PR #10228 [ci skip]
2019-12-18 10:39:11 -06:00
cdb26e4916
Merge pull request #10228 from Putnam3145/quirk-fix
...
fixes quirks (again)
2019-12-18 09:39:08 -07: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
0e6ac60a66
Merge pull request #1 from Citadel-Station-13/master
...
update
2019-12-18 17:17:44 +01:00
114026f9ae
argk
2019-12-18 02:40:51 -08:00
5ec5650c6f
Automatic changelog generation for PR #10227 [ci skip]
2019-12-18 00:41:44 -06:00
29d6820ef0
Merge pull request #10227 from Putnam3145/quirk-fix
...
Probably fixes only neutral traits existing
2019-12-17 23:41:42 -07:00
3dbf813817
probably fixes only neutral traits existing
2019-12-17 22:34:28 -08:00
8b61c07713
Automatic changelog generation for PR #10153 [ci skip]
2019-12-17 14:09:11 -06: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
844e9861b0
Automatic changelog generation for PR #10076 [ci skip]
2019-12-17 13:58:42 -06: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
27a03aa30f
Automatic changelog generation for PR #10026 [ci skip]
2019-12-17 13:58:03 -06:00
b8c5290011
Merge pull request #10026 from Linzolle/neck-slice
...
Neck slice
2019-12-17 11:58:00 -08:00
cfe35ce2fd
Merge pull request #10167 from Ghommie/Ghommie-cit458
...
Fixing some not safe for work oddity.
2019-12-17 11:52:41 -08:00
5d6c2e9f82
Automatic changelog generation for PR #10172 [ci skip]
2019-12-17 13:51:05 -06:00
ed44b3130c
Merge pull request #10172 from Ghommie/Ghommie-cit460
...
Porting several quirks code updates.
2019-12-17 11:51:03 -08:00
d215aa2d79
Automatic changelog generation for PR #10216 [ci skip]
2019-12-17 13:47:21 -06: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
CitadelStationBot