cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,921 Commits 26 Branches 2 Tags
6b2add6eb9cff51637c73ef1bbe9ccd0598aaa98
Commit Graph

9562 Commits

Author SHA1 Message Date
Arkatos1
6b2add6eb9 Deconflict 2019-08-26 18:53:55 +02: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
a1c07f20b6 Fixes Plasmamen Atmos Techs Not Getting Proper Suit 2019-08-26 06:16:39 -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
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
Fox McCloud
dd346515e5 additional suits 2019-08-25 17:42:48 -04:00
variableundefined
9facf36ec2 Merge pull request #12038 from Shadow-Quill/AI-APC-Fix 
Fixes APC menus not opening after the powerloss hack
 2019-08-25 17:38:00 -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
Shadow-Quill
371dc95b8f Update life.dm 
LET THERE NOT BE SRCs!
 2019-08-25 12:30:49 -05:00
Fox McCloud
7867bd8b71 Fixes Stuns 2019-08-25 01:36:40 -04:00
Fox McCloud
4c6651fa72 fixes 2019-08-24 20:13:09 -04: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
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
6f254e8339 Fixes Stun Absorbtion Not Working 2019-08-23 16:57:18 -04:00
variableundefined
4cebe6a08a Merge pull request #11719 from Terilia/headcrabs 
Headcrabs
 2019-08-23 15:16:30 -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
7b2cc1e12b Merge pull request #11808 from Couls/fat-mice 
Mice now have a chance of chewing through wires
 2019-08-22 19:21:47 -04: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
Fox McCloud
c805cda038 Merge pull request #11615 from Tayyyyyyy/aa/parallax-no-sql 
Parallax
 2019-08-19 21:13:33 -04:00
Fox McCloud
3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
Shadow
ddd89e318b LET THERE BE LIFE! 2019-08-19 16:35:20 -05:00
Fox McCloud
9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
SteelSlayer
3e7156e263 Ghost health/cyborg analyzer 2019-08-17 10:00:05 -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
Terilia
a134228787 removes unneeded spawn and nerfs headcrabs a little. 2019-08-15 12:24:28 +01:00
variableundefined
a5e94c6e72 Merge pull request #11776 from Arkatos1/SlimeHUD 
SlimeHUD
 2019-08-15 10:37:12 +08:00
Couls
3b35952ff1 mice no longer whisper to the cables before chewing them 2019-08-14 20:17:18 -04:00
Fox McCloud
b3423eac2f Merge pull request #11984 from Markolie/ruinsport 
Netherworld portal fix and butler pick time increase
 2019-08-14 20:02:29 -04:00
variableundefined
353f0e0b3b Merge pull request #11844 from JKnutson101/cyborgSuccumbBranch 
Gave Cyborgs with 0 battery left the ability to succumb.
 2019-08-14 23:25:16 +08:00
variableundefined
3f990b50ea Merge pull request #11980 from TheSardele/drunk-sleep 
Fixes sleeping drunk making you more drunk
 2019-08-14 14:22:30 +08:00
AffectedArc07
03af0be168 Ghost parallax 2019-08-13 16:32:31 -07:00
AffectedArc07
cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
Terilia
442dd891d1 Merge branch 'headcrabs' of https://github.com/Terilia/Paradise into headcrabs 2019-08-13 14:38:53 +01:00
Terilia
b11e7808b2 Headcrabs can now leap at people. 2019-08-13 14:38:48 +01:00
variableundefined
bbaf765279 Merge pull request #11949 from florkeger/hierophant-layer-fix 
Hierophant layer fix
 2019-08-13 00:50:05 +08:00
variableundefined
0bb1ba6eae Merge pull request #11830 from Emanthealmighty/AIchange 
AI can now change its intent
 2019-08-12 23:08:58 +08:00
Arkatos1
cedec38e9b Merge https://github.com/ParadiseSS13/Paradise into SlimeHUD 2019-08-12 16:38:33 +02:00
Arkatos1
c9ccf56ebd Merge https://github.com/ParadiseSS13/Paradise into Magic-With-Style 2019-08-12 16:34:52 +02:00
variableundefined
d59b09c382 Merge pull request #11539 from farie82/Fix-weird-identity-issues 
Fixes weird identity problems
 2019-08-12 14:54:26 +08:00
variableundefined
ec39d864bf Merge pull request #11988 from Tayyyyyyy/input_fixes 
Fix input sanitization issues
 2019-08-12 14:39:14 +08:00