Commit Graph

3449 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
ecec14e939 Merge pull request #12041 from Ionward/sprite-touchup-august19
Species Sprite Touchup and Minor Additions
2019-08-22 19:33:33 -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
Crazy Lemon
3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update
Major Lavaland Update
2019-08-16 22:22:49 -06:00
AzuleUtama
30b526f40c Update briefcase.dm 2019-08-15 19:17:24 +01:00
variableundefined
34bb102a37 Merge pull request #11767 from Arkatos1/pillbottle
New Medical Directive - Colored Pillbottles!
2019-08-15 11:17:46 +08: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
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
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
variableundefined
ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol
Observer/hud improvements and fixes
2019-08-11 16:23:23 +08:00
Fox McCloud
6c8fe1d506 Merge pull request #11864 from Markolie/portalfix
Portal fix
2019-08-10 23:24:58 -04:00
Fox McCloud
ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
Crazy Lemon
ae27e39dec Merge pull request #11976 from Fox-McCloud/fix-dual-swords
Fixes Sharpening Toy Swords
2019-08-09 17:56:48 -06:00