cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,685 Commits 26 Branches 2 Tags
06ef8c94de23b2be6576f61ef4c3c70fea3a82e6
Commit Graph

917 Commits

Author SHA1 Message Date
Fox McCloud
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
Coul
30cce3e730 Merge remote-tracking branch 'upstream/master' into rename-organs 2019-09-30 12:29:48 -04:00
variableundefined
4d0d32aa66 Remove encased var from unbreakable limbs 2019-09-29 19:42:10 -07:00
variableundefined
c2bba81a4e Merge pull request #12429 from JKnutson101/roboCosmetic 
Allows for robotic hands, feet, and groin to undergo customization surgery.
 2019-09-29 19:40:35 -07:00
Couls
639d585fa6 Fix heart icons going invisible (#12444) 2019-09-28 12:20:23 -07:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
 2019-09-28 00:16:11 -04:00
Coul
a993b80959 remove ribs and skull from unbreakable limbs 2019-09-27 20:45:01 -04:00
Coul
30fcaf11af rename slime organs to be more player friendly 2019-09-27 20:29:30 -04:00
Couls
56d994b464 Slime people rework (#11990) 2019-09-26 16:53:09 -07:00
unknown
7d1978fabe added, left and right hands and feet and groin to list of cosmetic robotic surgeries 2019-09-26 18:53:11 -04:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
 2019-09-21 12:40:07 -04:00
Fox McCloud
d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
Fox McCloud
593c18cb42 Vox Rework (#12343) 2019-09-20 17:58:59 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud
60c04285cf Bubblegum rework 2019-09-11 23:06:34 -04:00
Fox McCloud
d19961378d first-we-burn-away-the-world-that-was 2019-09-09 14:48:29 -04:00
Fox McCloud
92411d7a02 Merge pull request #11853 from Kyep/ts_gateway_fix 
Terror Spider Fixes & Tweaks
 2019-09-08 03:51:59 -04:00
Kyep
c5b4cdab3a fixes eggs not causing confusion as intended 2019-09-06 23:58:43 -07:00
Fox McCloud
8b72c3b64a Fixes Romerol--Comments it Out Until Refactor 2019-09-03 23:16:32 -04:00
Fox McCloud
35bb8d069d Merge pull request #12147 from KasparoVy/light_gone_out 
Fix Incorrect Eye-Colour for Races Without Shiny Eyes
 2019-08-30 01:10:57 -04:00
KasparoVy
49b3aa415a Rationale 
Commenting
 2019-08-30 00:58:28 -04:00
KasparoVy
abfbe21daa Fix a Broken Fix 
Overlays don't carry over from organ get_icon() and have to be blended if we want to use them in that way - currently eyes are the only thing update_icons() doesn't have its own way of rendering so eyes are the only thing here that get blended AND overlayed
 2019-08-30 00:37:35 -04: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
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
variableundefined
b488d9d27e Merge pull request #11989 from Fox-McCloud/diona-refactor 
Diona Rework
 2019-08-27 18:03:47 -04:00
Couls
dfe9752da7 Merge remote-tracking branch 'upstream/master' into blood-changes 2019-08-25 22:37:25 -04:00
Couls
a42f638b73 spessing 2019-08-25 22:22:05 -04:00
joep van der velden
ab155d4ca4 Implants now work again 2019-08-25 08:59:36 +02: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
Fox McCloud
bb0fcaa73f Merge pull request #11986 from Aurorablade/honk 
Upgrades Honktumor, Adds Honkbladder
 2019-08-21 01:51:23 -04:00
Fox McCloud
c6372ec138 Merge pull request #12044 from DoctorDrugs/Colossus-vocal-cords-fix 
Removes the ability to consume the divine vocal cords
 2019-08-20 21:12:31 -04:00
DoctorDrugs
e293f5b012 Removes the ability to consume the divine vocal cords 2019-08-20 16:23:53 -04:00
Fox McCloud
0189cd1dee Diona Rework 2019-08-12 01:51:29 -04:00
Aurorablade
fed5f53b73 Suffer eternally peons 2019-08-11 23:40:39 -04:00
Couls
5d18578aa5 Merge remote-tracking branch 'upstream/master' into blood-changes 2019-08-04 21:14:30 -04:00
joep van der velden
402d1ef131 No drop items now lose their nodrop if dropped 2019-07-29 00:03:18 +02:00
variableundefined
318e115280 Merge pull request #11653 from Couls/bone-rework 
Bones nerf
 2019-07-12 18:15:17 +08:00
Couls
2470380c40 Blood is now less annoying 2019-07-07 03:21:57 -04:00
Mark van Alphen
94eb652f15 Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix 2019-06-03 17:39:23 +02:00
Couls
fa71cead64 Update organ_external.dm 2019-06-02 16:54:55 -04:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen
d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
Mark van Alphen
a03603775b Initialize fix 2019-05-01 02:35:26 +02:00
Mark van Alphen
0d73736be2 Make the traitor reviver implant EMP-proof 2019-05-01 02:34:16 +02:00