cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-17 04:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,144 Commits 27 Branches 2 Tags
f4e8a7cb7014c1eba37da2121863f70b9d4e9301
Commit Graph

9609 Commits

Author SHA1 Message Date
Fox McCloud
1d59bfe8ff Merge pull request #11962 from variableundefined/TasteOfVictory 
TG Taste System Port continued
 2019-08-31 20:28:36 -04:00
variableundefined
95afbe55a5 Merge pull request #12144 from Fox-McCloud/the-refactor-to-end-all-refactors 
The Most Important Refactor Ever
 2019-08-31 20:15:13 -04:00
variableundefined
3dca5d09ec Code styling + Vitamin 2019-08-31 20:00:52 -04:00
variableundefined
a5c0138dda Deconflict and revert an accidental iconstate name change 2019-08-31 09:18:36 -04:00
farie82
9d58af6ec5 Merge branch 'master' into hoodies 2019-08-30 22:57:07 +02:00
Fox McCloud
7a61ecb637 The Most Important Refactor Ever 2019-08-29 23:12:59 -04:00
variableundefined
e636c8e80a Merge pull request #12142 from Fox-McCloud/blood-drunk 
Fixes Blooddrunk Buff
 2019-08-29 22:30:24 -04:00
Fox McCloud
2bdb6f448f Fixes Blooddrunk Buff 2019-08-29 22:12:02 -04:00
Fox McCloud
20b35033f7 Merge pull request #12135 from Shadow-Quill/Ooh-Ahh-Push-It 
Fixes pushing necropolis tendrils
 2019-08-29 21:03:31 -04:00
variableundefined
549e6ee72e Merge pull request #12105 from Fox-McCloud/ports-tendril-loot 
Adds Book of Babel and Jacob's Ladder
 2019-08-29 20:43:18 -04:00
Shadow
82860bc875 MFW I FORGET TO UNEMBIGGEN 2019-08-29 19:34:43 -05:00
Shadow
a4b3030e4a mfw I forget to anchor 2019-08-29 19:14:21 -05:00
variableundefined
87fb73def7 Merge pull request #12112 from Fox-McCloud/gps-location 
GPS Location Status
 2019-08-29 19:50:54 -04:00
Shadow
f47716bf5e EMBIGGENED! 2019-08-29 18:31:32 -05:00
Shadow
91a0e50673 removal 2019-08-29 18:15:24 -05:00
Shadow
6cffcac0da the anchorening 2019-08-29 18:04:32 -05:00
Fox McCloud
93c04d79f9 Merge pull request #12114 from KasparoVy/light_gone_out 
Fixes Bugs with Shining Eyes, Disembodied Heads and Admin-Reviving Beheaded Humanoids
 2019-08-29 16:40:22 -04:00
Shadow-Quill
ec387261f9 Stop it! Get some help. 2019-08-29 07:56:21 -05:00
KasparoVy
f30cfd850d Fix Some Bugs With Admin-Reviving Headless Dudes 
Admin-reviving a decapitated body will now regrow the head with the ears organ and all the appearance features (hair, eyes, etc.) it used to have according to the mob's DNA.
 2019-08-29 00:34:17 -04:00
variableundefined
c59006ec5f Merge pull request #12004 from datlo/golemtweaks 
Mineral golems fixes and features
 2019-08-28 07:59:43 -04:00
variableundefined
b77bee2874 Merge pull request #12084 from TheSardele/no-vore 
Removes the ability of obese and matter eater to swallow people
 2019-08-28 07:36:23 -04:00
KasparoVy
5b20a67ed2 Fixes Bugs Darkening Glowing Eyes & Preventing Full Rendering of Disembodied Heads, Cleanup 
By correcting the plane the eye shine is rendered on. By sharing the same plane as the lighting, the eye shine was getting dimmed slightly (somehow). Referred to Polaris codebase, where this was originally ported from.

Lumps in an update/write-up for get_icon_difference()
Cleans up organ_icon.dm and resolves an issue preventing appearance overlays (hair, eyes, etc.) from remaining on disembodied heads to reduce unnecessary icon operations.
 2019-08-28 06:08:17 -04:00
Fox McCloud
a413b1f007 Merge pull request #11994 from Markolie/slimegenocide 
Improve water handling for slimes, Grey mask/head water protection tweak
 2019-08-28 03:14:50 -04:00
Fox McCloud
d74e5288f3 refactor health sensors 2019-08-28 01:47:50 -04:00
Fox McCloud
1f47292d34 GPS Location Status 2019-08-28 01:38:00 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
variableundefined
b488d9d27e Merge pull request #11989 from Fox-McCloud/diona-refactor 
Diona Rework
 2019-08-27 18:03:47 -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
a4f187ac38 Adds Book of Babel and Jacob's Ladder 2019-08-27 16:04:54 -04:00
variableundefined
d277e0c78d Merge pull request #11673 from Arkatos1/Magic-With-Style 
Wizard Update - Magic with style
 2019-08-27 16:04:52 -04:00
variableundefined
83751e8e74 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into TasteOfVictory 2019-08-27 15:20:23 -04:00
Mark van Alphen
ffd73c75ec Merge branch 'master' into slimegenocide 2019-08-27 17:40:20 +02:00
datlo
708e591365 Add lubed floors, skeletons 2019-08-27 12:54:53 +02:00
datlo
9ec6c795d1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into add-biodomes 2019-08-27 11:02:49 +02:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
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
Fox McCloud
899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -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