Commit Graph

8705 Commits

Author SHA1 Message Date
variableundefined 213e36c1ad Merge pull request #12066 from Fox-McCloud/lavaland-reorganization
Re-organizes Lavaland Files; Makes some Balance tweaks
2019-08-25 16:39:30 -04:00
SteelSlayer e1f4a08c54 Adds hand defib to the paramedic EVA closet 2019-08-25 00:49:02 -04:00
Fox McCloud cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
variableundefined a968dc6a09 Merge pull request #11936 from farie82/antidrop-remove-on-drop
Dropped anti drop items now lose the antidrop status if not initialized with it
2019-08-24 10:53:23 -04:00
variableundefined 4820635a7d Merge pull request #11957 from FreeStylaLT/enginepicker
Adds an Engine Picker to Engineering
2019-08-24 10:49:58 -04:00
Fox McCloud 9b9d5461ef Re-organizes Lavaland Files; Makes some Balacne tweaks 2019-08-24 03:58:05 -04:00
KasparoVy ca495b2b9b Adds Sprites for Some Armalis+Vox Gear & Species-fitting Inhand Icons, etc.
Adds sprites for all Vox & Armalis earwear
Adds sprites for Armalis default backpack, nitrogen tank (non-'emergency' back & belt) all breathmask variations

Fixes an issue where Vox Armalis wouldn't be rendered with the proper in-hand icons for their massive noise cannons.
Fixes an issue where you couldn't species-fit earwear.
Fixes an issue where Vox Armalis couldn't wear the 'Vox' breath mask.
2019-08-23 22:14:47 -04:00
Fox McCloud e602e4fa30 Updates Food and Candy Sprites 2019-08-23 17:37:38 -04:00
variableundefined 1dc8e66cbc Merge pull request #11772 from Couls/constructable-rechargers
[READY] Constructable Rechargers and machinery tweaks
2019-08-23 09:16:37 -04:00
variableundefined e18777959e Merge pull request #11818 from Couls/baseball-deflects
Baseball!
2019-08-23 08:05:41 -04:00
Couls 6d7ee9c934 use hit_reaction instead 2019-08-23 00:40:44 -04:00
Fox McCloud f8c447dbba Merge pull request #12023 from SteelSlayer/ghost-health-analyzer
Health and Cyborg analyzer for ghosts
2019-08-22 19:54:48 -04:00
Fox McCloud ecec14e939 Merge pull request #12041 from Ionward/sprite-touchup-august19
Species Sprite Touchup and Minor Additions
2019-08-22 19:33:33 -04:00
FreeStylaLT bf572e70a1 Merge branch 'master' into enginepicker 2019-08-23 01:59:00 +03:00
Couls 8715878a67 Fix cardboard box walldash 2019-08-22 16:51:07 -04:00
Fox McCloud 39d0b0b3f5 Merge remote-tracking branch 'upstream/master' into crusher-trophies 2019-08-22 16:28:06 -04:00
variableundefined 806c00ba68 Merge pull request #12039 from Fox-McCloud/more-lavaland-updates
More Lavaland Updates: Primal and Bayonets
2019-08-21 22:38:25 -04:00
Fox McCloud a8f9410b8d Merge pull request #12028 from Shadow-Quill/Health-Analyzer-Toggle
Use Health Analyzers inhand to switch verbosity
2019-08-21 01:52:11 -04:00
Fox McCloud 052ee02db4 Merge pull request #12002 from Markolie/falsewallfix
False wall secure fix, add extra step to plating deconstruction
2019-08-21 01:31:21 -04:00
Ionward e347ae8dfe a little more than a touchup, includes: grey fit backpacks + uniforms and fixes associated, drask glasses and masks, and a version of the god eyes for drask grey and vox 2019-08-19 18:34:37 -07:00
Fox McCloud e05e85618f nah, needs a refactor 2019-08-19 20:15:29 -04:00
Fox McCloud 3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
datlo 28caad13f9 add winter/clown biodomes 2019-08-18 21:06:58 +02:00
Shadow c2015c6608 THE SWITCHENING 2019-08-18 12:47:02 -05:00
Fox McCloud 9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
SteelSlayer e0a34a179b Adds destination tagger to atmos locker 2019-08-17 13:07:35 -04:00
SteelSlayer 3e7156e263 Ghost health/cyborg analyzer 2019-08-17 10:00:05 -04:00
Crazy Lemon 3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update
Major Lavaland Update
2019-08-16 22:22:49 -06:00
Fox McCloud e2f7f6f055 science radio 2019-08-16 23:58:27 -04:00
variableundefined adc33ef3a0 Merge pull request #11783 from Couls/on-hit-effects
[READY] Add on-hit effects for lasers and bullet holes for walls from TG
2019-08-16 07:50:49 +08:00
AzuleUtama 30b526f40c Update briefcase.dm 2019-08-15 19:17:24 +01:00
variableundefined f82adc1310 Merge pull request #11937 from farie82/Borgs-crate-rig-fix
Rigging a crate now costs 15 coils instead of deleting your stack
2019-08-16 00:33:20 +08:00
farie82 00d7eb7c3f Update crates.dm 2019-08-15 18:16:50 +02:00
variableundefined 34bb102a37 Merge pull request #11767 from Arkatos1/pillbottle
New Medical Directive - Colored Pillbottles!
2019-08-15 11:17:46 +08:00
variableundefined 9945c04f96 Merge pull request #11833 from dovydas12345/Chair
Fixes being able to pick up chairs with full hands or without hands.
2019-08-14 23:47:12 +08:00
FreeStylaLT 6fda029db8 conflicts 2019-08-14 14:19:33 +03:00
Mark van Alphen df2df63b5f False wall secure fix, add extra step to plating deconstruction 2019-08-14 04:13:47 +02:00
Couls 7c5bdcc83c Merge remote-tracking branch 'upstream/master' into unrestricted-airlocks 2019-08-13 21:46:32 -04:00
variableundefined 9097eb0e1d Merge pull request #11741 from AzuleUtama/chameleonGlasses
Traitor thermals and security HUD now use updated chameleon code, Slight buff to the thermals
2019-08-13 12:06:39 +08:00
Mark van Alphen d1ad6aad45 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slimegenocide
# Conflicts:
#	code/__DEFINES/misc.dm
2019-08-13 02:32:53 +02:00
Mark van Alphen 521e81e8d2 Improve water handling for slimes, Grey mask/head water protection tweak 2019-08-13 02:26:59 +02:00
AzuleUtama f550b19f8d conflicts and reviews 2019-08-12 19:04:21 +01:00
Arkatos1 bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
variableundefined f6505a6fd5 Merge pull request #11819 from Kyep/medals
Department Medals
2019-08-12 17:52:22 +08:00
variableundefined 2b53fb0ab3 Merge pull request #11392 from Citinited/airlock-spawners
Airlock spawners 2: Electric Boogaloo
2019-08-12 13:30:26 +08:00
Fox McCloud 6a7fc31d83 woops, forgot this 2019-08-12 00:09:27 -04:00
Fox McCloud 39c9e9abde Reworks Plasmamen 2019-08-11 18:56:32 -04:00
Fox McCloud 5b43b9b836 Merge pull request #11934 from Ty-Omaha/remote-finger
Adds hidden fingerprint to remote door uses
2019-08-11 17:09:46 -04:00
variableundefined 0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize
Sanitize all inputs
2019-08-11 22:09:10 +08:00
variableundefined 9eff8a8663 Merge pull request #11696 from Markolie/shuttlechairs
Add shuttle chairs (and fix newlines on all maps)
2019-08-11 16:32:14 +08:00