Commit Graph

40933 Commits

Author SHA1 Message Date
oranges 769b1c5079 Merge pull request #33120 from QualityVan/glasses
Makes glasses handle both nearsightedness and eye damage
2017-12-01 14:22:14 +13:00
Robustin 8d52861fe7 Moderate Damage Examination (#33008)
Ok so the last one only worked on carbons who weren't humans, woops. See: #32707

🆑 Robustin
tweak: Damage examinations now include a "moderate" classification. Before minor was <30 and severe was anything 30 or above. Now minor is <25, moderate is 25 to <50, and severe is 50+.
/🆑
2017-12-01 14:16:31 +13:00
Robustin 7521dc67ee Flash burns out AFTER flashing 2017-11-30 18:15:46 -05:00
vuonojenmustaturska 124ddac8f6 let's swap it here instead 2017-11-30 23:12:20 +02:00
vuonojenmustaturska 167e8defd4 runtime fix 2017-11-30 23:10:05 +02:00
Leo 3e2187d268 Merge pull request #33153 from AnturK/adv_cam_cleanup
Fixes some advanced camera issues
2017-11-30 18:42:52 -02:00
ninjanomnom 7b7b67edd8 In-code key handling system 2017-11-30 07:40:27 -05:00
FrozenGuy5 622e4ad39e nice removal (#33167) 2017-11-30 01:56:02 -05:00
Jordan Brown a3085ed935 Do this (#33149) 2017-11-30 01:55:33 -05:00
Emmett Gaines 642fa696eb sm soundtweak (#33154) 2017-11-29 21:58:56 -05:00
Matt Smith e21be98e0f Fix turbine showing broken (#33144) 2017-11-29 21:55:45 -05:00
Tad Hardesty 0fb7f2649c Remove unnecessary argument to Join 2017-11-29 14:04:19 -08:00
FrozenGuy5 17d64981bc cardboard no longer can damage you 2017-11-29 20:18:49 +00:00
AnturK aff91c3544 You know what let's go with minimal change. 2017-11-29 21:01:17 +01:00
AnturK 3ac9d24cb0 Nuke Op Datumization (#32680)
* Nuke Op datumization.

* Whoops

* Fixes use_tag for nukes. Only syndiebomb uses one.

* Fixing rebase stuff

* How many times

* Cleanup
2017-11-29 13:52:58 -05:00
The-clown-known-as-Pepe 7eb63cf1b8 Adds survival knifes to nukeop gear and ability to mount bayonets on few weapons, new bayonet sprites. (#33071) 2017-11-29 11:47:11 -05:00
Wayde deae86d949 Fix for applying collars to pets that don't have relevant icon. (#33156)
* Trying to fix git

* Performed cleanup as requested.

Tested, still working as intended.
2017-11-29 08:24:57 -05:00
Kyle Spier-Swenson 8c4885cf6e Revert "Ore Stacking (#33062)"
This reverts commit 8e1ac5720d.
2017-11-28 22:56:54 -08:00
kevinz000 8e1ac5720d Ore Stacking (#33062) 2017-11-28 21:27:34 -05:00
Tad Hardesty 219328cd7a Overhaul and fix destructive analyzer menu 2017-11-28 17:59:42 -08:00
Tad Hardesty 23c0516c87 Fix and tidy the output of research scanner goggles 2017-11-28 17:59:42 -08:00
Tad Hardesty 58433f5b04 Avoid string concatenation when building the lathe list 2017-11-28 17:59:42 -08:00
Tad Hardesty 7bdb5e28dc Cache design datum icons for sanic speed 2017-11-28 17:59:42 -08:00
Tad Hardesty a2150c14b5 Update departmental lathes to match the R&D console 2017-11-28 17:59:41 -08:00
Tad Hardesty 1c0db5fede Show prereqs and unlocks as columns in the node view 2017-11-28 17:59:41 -08:00
Tad Hardesty c471e1cb28 Cache tiers rather than recalculating them constantly 2017-11-28 17:59:41 -08:00
Tad Hardesty f66b762383 Show past, current, and future techs in columns 2017-11-28 17:59:41 -08:00
Tad Hardesty 00992ed73d Improve the techweb design view
The technologies which unlock the design are shown. Lathe types are
shown visually. If the design is constructible, a button to go to the
lathe search screen is shown.
2017-11-28 17:59:41 -08:00
Tad Hardesty 2214cca1fc Enhance R&D Console UI in various ways
The header has been made tighter, shows current research production, and
doesn't show disk status. Researchable technologies in the overview show
their point cost. Tech summaries are tighter, and unlocked designs are
represented visually with tooltips.
2017-11-28 17:59:41 -08:00
Shadowflame909 5a5f9c2891 Update artefact.dm (#33129)
Beep Beep more hard to get suicides are fun!
2017-11-28 20:05:30 -05:00
ShizCalev 49c92ada07 Fixes twohanded weapons showing outdated icons (#33127) 2017-11-28 20:03:28 -05:00
Kyle Spier-Swenson 01ad14d293 Makes the sloth an actual sloth (#33131)
glide_size change lowers their tile glide rate to be slow as well.
2017-11-28 20:02:29 -05:00
ShizCalev 24ca193e7e Fixes big band music crate (#33138) 2017-11-28 20:01:29 -05:00
Tad Hardesty 6959b05ea7 Fix name on Mech LMG tech node (#33135) 2017-11-28 20:00:59 -05:00
JJRcop 1e770b4148 Fixes VV Make Space Ninja verb (#32982) 2017-11-28 10:19:55 -02:00
ACCount 81fb344c75 Removes mass-spectrometers (#32965) 2017-11-28 10:19:08 -02:00
Tad Hardesty 6a0ef61b42 Fix manually-given download objective description (#33133) 2017-11-28 03:43:25 -05:00
ACCount f086eab113 Removes "machine prototypes" (#33134) 2017-11-28 03:41:09 -05:00
ACCount 78f0a50e15 Removes some unused sprite files (#33121)
* Removes two unused sprite files

* Removes two more sprites
2017-11-28 03:39:46 -05:00
ACCount 699898431e Moves pipe meter sprites (#33122) 2017-11-28 03:38:11 -05:00
Cruix 069f909e17 Added bot path data huds (#32967)
* Added bot path data huds

* Bot path data hud improvements
2017-11-28 09:13:57 +01:00
kevinz000 9c8f31657a fixes ricochets not resetting range 2017-11-28 00:44:26 -06:00
Leo 375795a5e6 Merge pull request #33100 from kevinz000/patch-397
Fixes KA unique loot modkits not having departmental flags
2017-11-27 22:37:58 -02:00
Jordan Brown 048372a3db Merge pull request #33109 from ShizCalev/camera-teleport
Cancels camera view on teleport
2017-11-27 17:53:50 -05:00
Jordan Brown 37ad5a5be6 Merge pull request #33140 from Wad67/master
Check door for (welded) upon closing
2017-11-27 17:52:02 -05:00
Jordan Brown 84fa73bbd1 Merge pull request #33112 from AnturK/devilfix
Fixes devilstuff
2017-11-27 17:50:46 -05:00
Wayde 0c8ba844fc Moved check to relevant area (cleanup) 2017-11-28 06:52:53 +10:00
Wayde 159ca05e80 Check door for (welded) upon closing 2017-11-28 06:42:17 +10:00
Cruix 077ef0145b Fixed a rare custom shuttle docker client crash (#33086) 2017-11-27 12:46:35 -05:00
Leo 54ec2d7f24 Merge pull request #33072 from AnturK/ibelievedinyoukornowlook
Fixes non-advanced diseases vaccines.
2017-11-27 12:25:28 -02:00