shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,964 Commits 5 Branches 0 Tags
84a413a43a84fc29083ca0be09e13aded79f6435
Commit Graph

11084 Commits

Author SHA1 Message Date
B1gb3ast
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
Putnam3145
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
Putnam3145
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
Putnam3145
b8c5290011 Merge pull request #10026 from Linzolle/neck-slice 
Neck slice
 2019-12-17 11:58:00 -08:00
Putnam3145
ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460 
Porting several quirks code updates.
 2019-12-17 11:51:03 -08:00
Putnam3145
7017ab243b Merge pull request #10216 from Ghommie/Ghommie-cit474 
Porting a few martial art code updates.
 2019-12-17 11:47:19 -08:00
Putnam3145
37cfec22aa Merge pull request #10066 from Sishen1542/aaaaaaaa 
neovgre qol changes
 2019-12-17 11:40:43 -08:00
Putnam3145
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
Putnam3145
0adcb900c1 Merge pull request #10155 from Seris02/windowfix 
adds some distance checks to some things
 2019-12-17 11:34:13 -08:00
Putnam3145
634154e7cf Merge pull request #10157 from Ghommie/Ghommie-cit452 
Ports "Fixes powernet avail checks"
 2019-12-17 11:33:33 -08:00
Putnam3145
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
Putnam3145
5945f30523 Merge pull request #10225 from Ghommie/Ghommie-cit475 
Two slimepeople fixes.
 2019-12-17 11:22:30 -08:00
BlackMajor
95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants 
Ported bamboo stuff from tg.
 2019-12-18 01:02:29 +13:00
Ghommie
f2cf146255 Two slimepeople fixes. 2019-12-17 12:49:04 +01:00
Ghommie
6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
Lin
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
Lin
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
Putnam3145
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
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Ghommie
9c5a66af67 Fixes AI being unable to talk through the holopad. 2019-12-16 15:58:10 +01:00
Useroth
8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
kevinz000
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
Ghommie
843f4ed0da FLAK 2019-12-16 02:44:58 +01:00
BlackMajor
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
Unknown
ad88481f3e OwO whats this notices your 2019-12-15 16:45:34 -07:00
Putnam3145
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
Putnam3145
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
Ghommie
22aba489e3 Fixes ranged syndicate mobs stormtrooper training: The port. 2019-12-16 00:21:28 +01:00
Unknown
008c4ef822 according to all known laws of aviation 2019-12-15 16:18:42 -07:00
Unknown
9bfba1d1d9 Merge branch 'master' into xantholne-christmas01 2019-12-15 16:14:37 -07:00
Ghommie
0a4a2acbab fixing double-flavour ice creams. 2019-12-16 00:00:58 +01:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
kappa-sama
f8a05b5ae1 perhaps 2019-12-15 17:31:49 -05:00
Artur
58f4f58cd2 Slaughter demons shouldnt bleed 2019-12-16 00:05:51 +02:00
Ghommie
d3d1f8328f compiles now. 2019-12-15 22:16:02 +01:00
Ghommie
80f47872d7 My head splodes. 2019-12-15 20:31:36 +01:00
BlackMajor
4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
Putnam3145
2e9503f6d7 Merge pull request #10166 from Ghommie/Ghommie-cit457 
Ports "Roundstart borg brains no longer decay."
 2019-12-14 20:37:57 -08:00
Lin
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
Unknown
73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
Lin
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
Lin
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
Ghommie
081d3df750 This is one serious Pepe Silvia complex. 2019-12-14 22:52:40 +01:00
Putnam3145
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
Ghommie
12b87b4f3d Better. 2019-12-14 19:29:51 +01:00
Ghommie
2ccfaf38fb consistency. 2019-12-14 19:27:39 +01:00
Ghommie
6117434c7f Ok 2019-12-14 19:24:43 +01:00
Ghommie
70252d2914 Fixing a few pill bottle issues with the ChemMaster. 2019-12-14 19:20:02 +01:00
Artur
6124fbf316 Hopefully this fixes the linter errors 2019-12-14 19:04:36 +02:00
Ghommie
3891c91799 virtual reality component improvements, fixes and documentation. 2019-12-14 17:19:48 +01:00