Commit Graph

5245 Commits

Author SHA1 Message Date
variableundefined
db211cfc54 Deconflict 2019-09-11 23:00:13 -04:00
variableundefined
bcd64e99be Merge pull request #12255 from Fox-McCloud/shards-glass-lights
Refactors Shards, Improved Light Replacer, Adds Plasmaspear
2019-09-11 10:10:18 -04:00
variableundefined
ee86b56d58 Merge pull request #12250 from Fox-McCloud/linda-upgrade-prep
Refactors Atmos Air Current Pushing
2019-09-11 01:28:55 -04:00
variableundefined
18b270cb7e Remove the structure/chair/wood/normal subtype, moving all properties to its parent. 2019-09-11 00:28:27 -04:00
Fox McCloud
7e0190b46a fix 2019-09-10 03:21:41 -04:00
Fox McCloud
40428e47d9 Refactors Shards, Improved Light Replacer, Adds Plasmaspear 2019-09-10 03:08:44 -04:00
variableundefined
69537dd60c Port TG hitby refactor and detonation of items by projectiles 2019-09-09 22:57:31 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
variableundefined
1270c56ef7 Merge pull request #12236 from Fox-McCloud/vending-machien-refactor-fix
Refactors Vending Machines and Fixes Restocking Exploit
2019-09-09 15:54:08 -04:00
Fox McCloud
b8f93f5151 fixes comment and sound 2019-09-08 11:27:32 -04:00
Fox McCloud
fde5769225 other vending machines 2019-09-08 10:59:04 -04:00
Fox McCloud
607343424b Refactors Vending Machines and Fixes Restocking Exploit 2019-09-08 08:41:08 -04:00
Fox McCloud
4162226cb1 Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split 2019-09-08 02:07:06 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
Fox McCloud
0119d350b4 Lavaland Update Part 2: Mobs 2019-09-07 02:26:31 -04:00
Fox McCloud
a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud
b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
variableundefined
271c62dbef Merge pull request #11535 from Couls/zombies
[Ready for review] Romerol Virus, Zombies!
2019-09-03 20:58:53 -04:00
Fox McCloud
91fffcc076 Updates/Refactors Personal Crafting 2019-09-03 17:58:33 -04:00
Coul
6b82bfe47d Merge remote-tracking branch 'upstream/master' into zombies 2019-09-03 15:52:43 -04:00
Fox McCloud
1197ed0738 less admin annoyance 2019-08-31 19:43:59 -04:00
Fox McCloud
7a61ecb637 The Most Important Refactor Ever 2019-08-29 23:12:59 -04:00
Fox McCloud
6b8140d9ff Fixes Baseball Bats Throwing Anchored Things 2019-08-29 20:58:53 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -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
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
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
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
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -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
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
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