cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 15:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,921 Commits 26 Branches 2 Tags
6b2add6eb9cff51637c73ef1bbe9ccd0598aaa98
Commit Graph

17394 Commits

Author SHA1 Message Date
Arkatos1
6b2add6eb9 Deconflict 2019-08-26 18:53:55 +02: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
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
variableundefined
9a29a171f3 Merge pull request #11948 from Emanthealmighty/Playerinteractionblob 
Blobbernaut major changes (player control!)
 2019-08-25 16:39:07 -04:00
Eman
3d3af66be2 Blobbernauts now lose health if they are not at max health outside of blob structures. 2019-08-25 22:24:20 +02:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
variableundefined
5daf9a190b Merge pull request #11712 from Markolie/lazy 
Custom outfit manager and spawn with outfit on transform/reincarnate
 2019-08-24 12:27:48 -04:00
variableundefined
e158d6d2fe Merge pull request #11926 from TDSSS/sun-buff 
Makes space/starlight actually scary for vamps
 2019-08-24 10:54:18 -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
4cebe6a08a Merge pull request #11719 from Terilia/headcrabs 
Headcrabs
 2019-08-23 15:16:30 -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
Couls
4885f6e72e fix an oopsie 2019-08-23 09:02:03 -04:00
variableundefined
a42226c112 Merge pull request #11691 from TDSSS/lavaland-fax 
Gives lavaland syndie base a fax (+some small other changes)
 2019-08-23 08:33:04 -04:00
variableundefined
50efe69004 Merge pull request #11912 from Quantum-M/noHumanizedMonkeyBlood 
Disallows Vampires from acquiring power from ckeyless humanized monkeys
 2019-08-23 08:12:25 -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
variableundefined
2d2ed96125 Merge pull request #12056 from Fox-McCloud/door-fix 
Fixes Door Timer Override
 2019-08-22 19:18:16 -04:00
Fox McCloud
f36ba11994 Merge pull request #12055 from Shadow-Quill/Plating-Repair 
Fixes having to unscrew plating to repair it
 2019-08-22 19:09:11 -04:00
Fox McCloud
bf5b29af77 Fixes Door Timer Override 2019-08-22 18:59:25 -04:00
FreeStylaLT
bf572e70a1 Merge branch 'master' into enginepicker 2019-08-23 01:59:00 +03:00
Shadow
1e0f915462 checkies 2019-08-22 17:20:13 -05: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
variableundefined
fe53f6c4c0 Merge pull request #12047 from Fox-McCloud/fix-airlocks 
Fixes Airlock Close Spam
 2019-08-21 19:03:30 -04:00
Fox McCloud
4bf69d57f4 this too 2019-08-21 18:17:07 -04:00
Fox McCloud
a6f04b3156 oops 2019-08-21 18:13:41 -04:00
Fox McCloud
d6f0b3d9df Fixes Airlock Close Spam 2019-08-21 18:10:25 -04:00
joep van der velden
e48d5f5a92 drop_item instead of unEquip 2019-08-21 19:27:09 +02:00
Fox McCloud
2fa5e22352 Merge pull request #12011 from Shadow-Quill/Yeet-That-Mass-Driver 
Corrects rods used in mass driver construction
 2019-08-21 01:52:23 -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
Tayyyyyyy
e49d77b953 Update shuttle directions 2019-08-19 21:29:25 -07:00
Tayyyyyyy
4fa093fb2c Improve shuttle parallax stopping 2019-08-19 21:29:13 -07:00