Commit Graph

8289 Commits

Author SHA1 Message Date
variableundefined
4255fb62a6 Merge pull request #12140 from Fox-McCloud/youre-not-batting-a-thousand
Fixes Baseball Bats Throwing Anchored Things
2019-08-29 22:18:47 -04:00
Fox McCloud
20b35033f7 Merge pull request #12135 from Shadow-Quill/Ooh-Ahh-Push-It
Fixes pushing necropolis tendrils
2019-08-29 21:03:31 -04:00
Fox McCloud
6b8140d9ff Fixes Baseball Bats Throwing Anchored Things 2019-08-29 20:58:53 -04:00
Fox McCloud
4716bdd272 Merge pull request #12053 from Couls/boxing-in-the-90s
Fix cardboard box walldash
2019-08-29 20:54:07 -04:00
Shadow
4da4257756 whoops, spilled my meme 2019-08-29 19:51:10 -05:00
variableundefined
549e6ee72e Merge pull request #12105 from Fox-McCloud/ports-tendril-loot
Adds Book of Babel and Jacob's Ladder
2019-08-29 20:43:18 -04:00
Couls
b1dd4d5496 use fox's code 2019-08-29 20:41:12 -04:00
Shadow
a4b3030e4a mfw I forget to anchor 2019-08-29 19:14:21 -05:00
Shadow
aab72a5d5c 3 big 5 me 2019-08-29 18:22:04 -05:00
Fox McCloud
4502b1fead Fixes Blood, Grafitti, and Fungus not Showing Up 2019-08-28 18:05:51 -04:00
variableundefined
b75db54b1f Merge pull request #12015 from SteelSlayer/atmos-QoL
Atmos tech QoL & Disposal pipe tweaks
2019-08-28 11:14:17 -04:00
Fox McCloud
a413b1f007 Merge pull request #11994 from Markolie/slimegenocide
Improve water handling for slimes, Grey mask/head water protection tweak
2019-08-28 03:14:50 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
Fox McCloud
1b10495f7d fix 2019-08-27 18:08:43 -04:00
variableundefined
e6a190ae72 Merge pull request #12093 from Fox-McCloud/sandbags-and-barricades
Adds Sandbags Reworks Security Barricades
2019-08-27 18:01:20 -04:00
variableundefined
722df75be4 Merge pull request #12090 from Fox-McCloud/jetpack-upgrade
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-27 17:39:19 -04:00
Fox McCloud
a4f187ac38 Adds Book of Babel and Jacob's Ladder 2019-08-27 16:04:54 -04:00
Mark van Alphen
ffd73c75ec Merge branch 'master' into slimegenocide 2019-08-27 17:40:20 +02:00
datlo
9ec6c795d1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into add-biodomes 2019-08-27 11:02:49 +02:00
Fox McCloud
0b46603e38 Merge pull request #12078 from SteelSlayer/paramedic-hand-defib
Adds a handheld defibrillator to the paramedic EVA closet
2019-08-27 02:40:31 -04:00
Fox McCloud
727be7d03f WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?! 2019-08-26 18:23:09 -04:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
variableundefined
97654f5d52 Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle
Ports VG's false briefcase
2019-08-26 08:53:14 -04:00
variableundefined
e702c2ef53 Merge pull request #11797 from Couls/blood-changes
Blood is now less annoying
2019-08-26 06:41:39 -04:00
variableundefined
289b890e76 Merge pull request #12087 from KasparoVy/skrekked_myself_up
Fixes Bug with Species-fitted Inhand Icons
2019-08-26 06:40:35 -04:00
Fox McCloud
1befa092be Adds Sandbags Reworks Security Barricades 2019-08-26 03:21:45 -04:00
Fox McCloud
899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -04:00
Couls
dfe9752da7 Merge remote-tracking branch 'upstream/master' into blood-changes 2019-08-25 22:37:25 -04:00
KasparoVy
285df0d994 Fixes Inhand Sprite Sheeting Bug
Caused by #11978, the bug presented where a species that was in the sprite_sheets of an item but didn't have a custom inhand item for it picked up an item like a uniform and suddenly a grey jumpsuit was rendered on them. Happened for Vox when picking up regular uniforms because they have species-specific uniform sprites but not species-specific inhands, so it triggered the conditional and caused silly issues.
2019-08-25 22:29:16 -04:00
Couls
a42f638b73 spessing 2019-08-25 22:22:05 -04:00
variableundefined
8dce28d3e5 Merge pull request #12073 from Fox-McCloud/hardsuit-helmet
Hardsuit helmet
2019-08-25 19:06:37 -04:00
variableundefined
634f916301 Merge pull request #12064 from Fox-McCloud/food-candy-sprites
Updates Food and Candy Sprites
2019-08-25 18:33:04 -04:00
Fox McCloud
9a4834a565 Merge remote-tracking branch 'upstream/master' into hardsuit-helmet 2019-08-25 18:15:10 -04:00
Fox McCloud
c95067217c Merge remote-tracking branch 'upstream/master' into plasmamen-rework 2019-08-25 17:43:34 -04:00
variableundefined
8269bc525e Merge pull request #11941 from farie82/examine-info
Adds tips to certain things + general fixes that for issues I across
2019-08-25 16:53:49 -04:00
Fox McCloud
85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme
2019-08-25 16:51:21 -04:00
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