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
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
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
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
47df4f452d
Update drink_reagents.dm
2019-12-17 14:26:21 -05: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
5245898c25
whoops
2019-12-17 23:46:15 +13:00
03d2e9eb6d
Compress secK9
2019-12-17 23:32:51 +13:00
3f06661de5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453
2019-12-17 03:34:11 +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
c036c2c835
Update drink_reagents.dm
2019-12-16 19:05:16 -05:00
1c3682cd15
Brings carbon action intent hotkeys down to living.
2019-12-17 00:03:39 +01:00
fe1576583c
Update code/modules/vending/cola.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-16 15:01:16 -05: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
51a17dff94
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:42 -05:00
c291511ab6
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:35 -05:00
bfbb6231a5
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:28 -05:00
2d488bee52
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:21 -05:00
3e86e2207e
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:07 -05:00
21b7fb0759
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:22:58 -05:00
7142894ce7
Make the boop louder.
2019-12-16 09:02:01 -05:00
2e4187b7c8
Add a boop sound effect
2019-12-16 08:56:51 -05:00
a4d6911324
Update code/modules/mob/living/carbon/carbon_defense.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 07:48:29 -05:00
13aaebcd22
Update code/modules/mob/living/carbon/carbon_defense.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 07:48:22 -05:00
e8d43dac87
Port boops and handshakes
2019-12-16 06:27:18 -05:00
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
9f71900052
oop
2019-12-15 23:29:01 -05:00
b6c9c73372
this cannot go wrong
2019-12-15 23:28:17 -05:00
b4bd2cbb5c
Update preferences.dm
2019-12-15 20:20:04 -07: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
0190054c97
Update carbon.dm
2019-12-15 17:08:41 -07:00
Ghommie