97654f5d52
Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle
...
Ports VG's false briefcase
2019-08-26 08:53:14 -04:00
1befa092be
Adds Sandbags Reworks Security Barricades
2019-08-26 03:21:45 -04:00
899eb9c948
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-26 00:11:42 -04:00
8dce28d3e5
Merge pull request #12073 from Fox-McCloud/hardsuit-helmet
...
Hardsuit helmet
2019-08-25 19:06:37 -04:00
634f916301
Merge pull request #12064 from Fox-McCloud/food-candy-sprites
...
Updates Food and Candy Sprites
2019-08-25 18:33:04 -04:00
9a4834a565
Merge remote-tracking branch 'upstream/master' into hardsuit-helmet
2019-08-25 18:15:10 -04:00
c95067217c
Merge remote-tracking branch 'upstream/master' into plasmamen-rework
2019-08-25 17:43:34 -04:00
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
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
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
cb6df7092c
Hardsuit Helmets Integration
2019-08-24 18:36:27 -04:00
4820635a7d
Merge pull request #11957 from FreeStylaLT/enginepicker
...
Adds an Engine Picker to Engineering
2019-08-24 10:49:58 -04:00
9b9d5461ef
Re-organizes Lavaland Files; Makes some Balacne tweaks
2019-08-24 03:58:05 -04:00
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
e602e4fa30
Updates Food and Candy Sprites
2019-08-23 17:37:38 -04:00
e18777959e
Merge pull request #11818 from Couls/baseball-deflects
...
Baseball!
2019-08-23 08:05:41 -04:00
6d7ee9c934
use hit_reaction instead
2019-08-23 00:40:44 -04:00
f8c447dbba
Merge pull request #12023 from SteelSlayer/ghost-health-analyzer
...
Health and Cyborg analyzer for ghosts
2019-08-22 19:54:48 -04:00
ecec14e939
Merge pull request #12041 from Ionward/sprite-touchup-august19
...
Species Sprite Touchup and Minor Additions
2019-08-22 19:33:33 -04:00
bf572e70a1
Merge branch 'master' into enginepicker
2019-08-23 01:59:00 +03:00
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
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
e05e85618f
nah, needs a refactor
2019-08-19 20:15:29 -04:00
3667557b60
More Lavaland Updates: Primal and Bayonets
2019-08-19 20:02:53 -04:00
c2015c6608
THE SWITCHENING
2019-08-18 12:47:02 -05:00
3e7156e263
Ghost health/cyborg analyzer
2019-08-17 10:00:05 -04:00
3313efed23
Merge pull request #11981 from Fox-McCloud/lavaland-update
...
Major Lavaland Update
2019-08-16 22:22:49 -06:00
e2f7f6f055
science radio
2019-08-16 23:58:27 -04:00
30b526f40c
Update briefcase.dm
2019-08-15 19:17:24 +01:00
34bb102a37
Merge pull request #11767 from Arkatos1/pillbottle
...
New Medical Directive - Colored Pillbottles!
2019-08-15 11:17:46 +08:00
6fda029db8
conflicts
2019-08-14 14:19:33 +03:00
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
f550b19f8d
conflicts and reviews
2019-08-12 19:04:21 +01:00
bddc7132c2
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
2019-08-12 16:36:43 +02:00
f6505a6fd5
Merge pull request #11819 from Kyep/medals
...
Department Medals
2019-08-12 17:52:22 +08:00
6a7fc31d83
woops, forgot this
2019-08-12 00:09:27 -04:00
39c9e9abde
Reworks Plasmamen
2019-08-11 18:56:32 -04:00
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
0b04d71445
Merge pull request #11515 from Tayyyyyyy/sanitize
...
Sanitize all inputs
2019-08-11 22:09:10 +08:00
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
ae70cbfe41
Merge pull request #11606 from Markolie/ghostqol
...
Observer/hud improvements and fixes
2019-08-11 16:23:23 +08:00
673d1c9f78
Merge pull request #11611 from farie82/blindfold-craftable
...
Blindfolds are now craftable from 3 cloth
2019-08-11 15:00:34 +08:00
6c8fe1d506
Merge pull request #11864 from Markolie/portalfix
...
Portal fix
2019-08-10 23:24:58 -04:00
ee0447dad6
Major Lavaland Update
2019-08-10 22:36:55 -04:00
ae27e39dec
Merge pull request #11976 from Fox-McCloud/fix-dual-swords
...
Fixes Sharpening Toy Swords
2019-08-09 17:56:48 -06:00
2ae1fc7ac2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs
...
# Conflicts:
# icons/obj/chairs.dmi
2019-08-09 23:41:07 +02:00
14e8022daf
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
...
# Conflicts:
# code/game/objects/effects/step_triggers.dm
2019-08-09 23:38:49 +02:00
f1899f0050
Merge pull request #11697 from Markolie/tribalhealing
...
Add tribal splints, ash walker tweaks and Lavaland tweaks
2019-08-09 17:22:22 -04:00
fdfbb8fd93
Fixes Sharpening Toy Swords
2019-08-09 16:36:04 -04:00
6ee8c0d96f
Merge remote-tracking branch 'upstream/master' into zombies
2019-08-04 21:05:10 -04:00
variableundefined