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
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
Ghommie