Commit Graph

7384 Commits

Author SHA1 Message Date
variableundefined
45fdcb4c46 Merge pull request #9719 from SamHPurp/smoothing-improvements
Icon Smoothing to StonedMC
2018-10-21 07:41:47 +08:00
variableundefined
4285f3ffef Merge pull request #9562 from DesolateG/MUSHROOMMUSHROOM
Refactors the global reagents lists to use the global SS.
2018-10-21 07:32:14 +08:00
variableundefined
7c42d596bb Merge pull request #9567 from Bram961/master
Window alt clicking utility
2018-10-21 07:30:47 +08:00
Desolate
91ae4713b8 removes mushroom changes 2018-10-20 16:34:24 -05:00
Kluys
c62b0a1a1c Typo fixu 2018-10-20 18:15:14 +02:00
joep van der velden
7253936c93 Me smurt. Me not save change 2018-10-20 14:05:23 +02:00
joep van der velden
3699822db0 Added notifications for the user 2018-10-20 13:35:05 +02:00
Mark Mak
05bd6bd088 Merge pull request #9843 from warior4356/Safe-Refactor
Safe Refactor
2018-10-19 12:35:59 +08:00
warior4356
fead9e552e Updated logo and description. Removed NT logo from UI 2018-10-18 18:36:56 -07:00
Mark Mak
91dcf447ec Merge pull request #9888 from Fox-McCloud/spark-refactor
Refactors Spark Spread Activation
2018-10-19 08:41:03 +08:00
Fox McCloud
73200c942d tweak 2018-10-18 19:50:24 -04:00
Mark Mak
4bc1a1c1ef Merge pull request #9363 from MarsM0nd/Refactor_UID
Href refactor: macros and playerpanel
2018-10-19 07:46:42 +08:00
tigercat2000
dbc3d17cc5 Merge pull request #9857 from Agameofscones/ID_Sticker_Redux
ID_Decal Sprites
2018-10-18 11:26:59 -07:00
Mark Mak
35591ad940 Merge pull request #9889 from Squirgenheimer/cryoruntimefix
adds sanity check to show_to for storage items
2018-10-18 08:54:08 +08:00
Squirgenheimer
9280f9f9bd adds sanity check to show_to for storage items 2018-10-17 18:33:50 -04:00
warior4356
f3fc4548b6 Requested code changes done, please recheck 2018-10-17 13:36:25 -07:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
Mark Mak
13d95c04e2 Merge pull request #9875 from lass9030/add-to-locker
Add uniform to blueshield locker
2018-10-17 21:36:11 +08:00
Mark Mak
b418ee8401 Merge pull request #9828 from datlo/honkinfiltrationkit
Adds the Honk Brand Infiltration Kit
2018-10-17 21:35:06 +08:00
lass9030
6776bdb242 add uniform to blueshield locker 2018-10-17 01:19:58 +02:00
warior4356
e8bffc5c3d Final tweaks 2018-10-15 19:13:52 -07:00
Mark Mak
a89f886a37 Merge pull request #9858 from Ty-Omaha/stunbaton-runtime
Fixes stunbaton runtime
2018-10-15 13:17:30 +08:00
Ty-Omaha
2862503d2b stunbaton runtime comment 2018-10-15 01:01:39 -04:00
Ty-Omaha
adbf0bb2cc stunbaton runtime fix 2018-10-15 00:54:17 -04:00
Gwydion Brain
d7ecb3bd8c Typo 2018-10-14 21:12:42 -07:00
Gwydion Brain
812c142fe9 Lil fixo 2018-10-14 21:06:37 -07:00
Gwydion Brain
09313bbea1 Initial 2018-10-14 21:04:12 -07:00
warior4356
3707242e64 Fixed a UI lag issue 2018-10-14 18:25:36 -07:00
warior4356
4eeb26aa0f Fixed examine_status and changed manufacturer 2018-10-14 17:45:43 -07:00
warior4356
c46e357954 Minor tweaks. 2018-10-14 17:39:02 -07:00
tigercat2000
315491786a Merge pull request #9838 from variableundefined/OreStackQOL
CtrlShiftClick for stack
2018-10-14 07:19:38 -07:00
Purpose
d11a0ac95b visibility 2018-10-14 11:52:09 +01:00
warior4356
e5a24dc82d Adds a comment 2018-10-14 03:38:55 -07:00
warior4356
12c538ea0e Used Wrap incorrectly, max is exclusive 2018-10-14 03:26:42 -07:00
warior4356
8b83e58ea0 Invalid combinations fixed 2018-10-14 03:09:48 -07:00
warior4356
5c37ea5449 Small bug fix. 2018-10-13 23:34:03 -07:00
warior4356
c7efdfaa29 Maybe finished? Needs testing. 2018-10-13 23:33:07 -07:00
Purpose
a77421f340 Oh dirt merged before the subsystem. Thats why. 2018-10-13 21:37:01 +01:00
Purpose
b2fc276158 Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements 2018-10-13 21:34:04 +01:00
variableundefined
b097b06b72 CtrlShiftClick for stack 2018-10-13 23:04:50 +08:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
datlo
ac5cc480b9 Adds the Honk Brand Infiltration Kit
Also adds the clown mask voice changer as part of the kit
2018-10-12 17:02:55 +01:00
variableundefined
96f5046f19 Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes
A few fixes
2018-10-12 13:48:02 +08:00
variableundefined
376cdc709a Merge pull request #9818 from farie82/twohanded-fix
Fixes the giving of required two handed items and chainsaw stuf
2018-10-12 13:24:19 +08:00
variableundefined
4de5284557 Merge pull request #9677 from DesolateG/global
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
tigercat2000
98c77fc466 Merge pull request #9343 from variableundefined/OreTGPort
Port over tg ore stack and stack merging
2018-10-11 19:34:13 -07:00
variableundefined
108ebfed3a Formatting improvement 2018-10-12 07:57:58 +08:00
Purpose
6c6d35d133 fixies 2018-10-11 22:02:23 +01:00
joep van der velden
c96adec91f Fixed it 2018-10-11 22:55:10 +02:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00