cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
968 Commits
Author SHA1 Message Date
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
variableundefinedandGitHub 4c24624313 Merge pull request #13027 from Fox-McCloud/goonchem-heparin 
Goonchem: Heparin Rework
 2020-03-14 23:53:42 -04:00
variableundefinedandGitHub 073fefd856 Merge pull request #12843 from farie82/antidrop-implant-fix 
Anti drop implants now don't break shit when EMPed
 2020-03-05 18:32:07 -05:00
Fox McCloud 9d9d6a8666 Goonchem: Heparin Rework 2020-02-24 18:29:08 -05:00
CitinitedandGitHub fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700) 
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
 2020-02-15 13:31:08 -07:00
farie82andGitHub 5b1941e784 Fixes a few runtimes (#12893) 
* Some runtime fixes

* fixes #12892

* Alternative fix. Better behaviour

* qdel atmos thingy when loc is null

* Eye colour init protection

* Whoops. Forgotten /

* Suggestions update

* Fixed a runtime where IPCs losing their arms would cause a runtime in the hand

* Fixes mobs being able to nuzzle a grill to dead and a runtime there

* Added extra logging to the NPCpools
 2020-02-14 22:17:29 -07:00
joep van der velden fe85dd8293 Anti drop implants now don't break shit when EMPed 2019-12-23 22:39:09 +01:00
Crazy LemonandGitHub 3191674f89 Merge pull request #12744 from SteelSlayer/slime-cluwne-no-die 
Getting cluwned ignores species brain damage modifiers
 2019-12-16 19:03:08 -08:00
SteelSlayer df2de1931e use_brain_mod 2019-12-14 00:13:28 -06:00
SteelSlayer 2a54c79256 Adds examine text for people who have open incisions 
Update examine.dm
 2019-11-21 19:39:23 -06:00
SteelSlayer 4705a89676 Makes cluwning ignore brain damage modifiers 
Update organ_internal.dm
 2019-11-18 18:48:46 -06:00
Fox McCloudandvariableundefined 45bb5241f0 Training Wheels Come Off (#12587) 2019-10-15 19:22:42 -04:00
Fox McCloudandvariableundefined 93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
variableundefinedandGitHub 3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage 
Universal Object Damage
 2019-10-06 23:22:48 -04:00
Fox McCloud 5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00
Coulsandvariableundefined 8129a6828a Change reviver to be new-crit friendly (#12464) 2019-10-04 14:48:20 -04:00
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
variableundefinedandGitHub 4d0d32aa66 Remove encased var from unbreakable limbs 2019-09-29 19:42:10 -07:00
Coulsandvariableundefined 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
Coulsandvariableundefined 56d994b464 Slime people rework (#11990) 2019-09-26 16:53:09 -07:00
farie82andvariableundefined 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloudandvariableundefined 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 McCloudandvariableundefined d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
Fox McCloudandvariableundefined 593c18cb42 Vox Rework (#12343) 2019-09-20 17:58:59 -07: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 McCloudandGitHub 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 McCloudandGitHub 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 McCloudandGitHub 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
variableundefinedandGitHub 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
variableundefinedandGitHub 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 McCloudandGitHub bb0fcaa73f Merge pull request #11986 from Aurorablade/honk 
Upgrades Honktumor, Adds Honkbladder
 2019-08-21 01:51:23 -04:00
Fox McCloudandGitHub 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