Commit Graph
1442 Commits
Author SHA1 Message Date
Markolie 1d7de41acb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/pooling/pool.dm
2017-01-27 17:28:14 +01:00
Fox-McCloud 4c2ecac801 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 07:42:05 -05:00
Fox McCloudandGitHub 25dbef3e40 Merge pull request #6175 from Allfd/RigPort
Ports MarsM0nd's RIG suit fixes.
2017-01-26 07:33:15 -05:00
KasparoVy d73413b046 Uses the Disabilities system more correctly
Allows eyes to track eye-dependent disabilities when removed from the mob.
Farwas and Wolpins are now incurably colourblind (non-genetics based), so going lesser-form and back won't wipe your colourblindness.

Eyes being straight-up deleted (as per how set_species() handles setting up the organs required for the species we're changing to) no longer wipes colourblindness.

Now with more helper procs, less unnecessary commenting, random changes and other cleanliness-related tweaks.
2017-01-26 04:10:55 -05:00
KasparoVy c16f734a6d Changes Colourblindness from a Preference to a Disability
For Vulpkanin and Tajara, it gives them their species-specific
colourblindness but their excellent darksight, too. Otherwise it gives
noir vision.

You can choose this disability at character creation. It is off by
default. You can turn it off via genetics and mutadone.

Fixes Cling Transform&Lesser/Greater form & Darksight bugs

Transforming to an identity will now, with 100% reliability, give you
the exact appearance as that ability bar the body_accessory and the
secondary hair/facial hair colours. Same thing with going from lesser
form to an identity that was not the one you lesser formed with.

Fixes the darksight bug from the last commit, happened 'cause typo.
Woops.

Eye Transplantation Applies Eye-dependent Genes

Transplanting colourblind Vulpkanin/Tajara eyes into a Human gives the Human
the dark_view and unique colourblindness of said Vulpkanin eyes.

Removing colourblind eyes will take the disability with it, meaning the
person will have colour vision/low darksight.
2017-01-25 23:10:22 -05:00
KasparoVy 28f9496713 Adds Colourblindness for Vulpkanin&Tajara, Refactors Darksight, tidying up, etc.
Adds colourblindness for Vulpkanin and Tajara that can be turned on by a
preference in character creation. By default, Vulpkanin and Tajara still
see in full colour, however their darksight is reduced to Human levels
unless they choose the 'unaugmented' eyes option.

Refactors darksight so it's tied to the eye organ. Refactors noir
glasses.

You can now visually distinguish mechanical/mechassisted organs from
their organic counterparts due to their names and icons.

Resolves issue w/ Colour-vision after Cloning/Lesser-to-greater Formswapping.

Cloned Vulpkanin and Tajara get unaugmented vision (colourblind and
darksight) by default since the cloners can't administer the
eye-augmentation surgery. Same goes for swapping from lesser to greater
form as a Changeling.

The monkey-forms of Vulpkanin and Tajara now have almost the same organs as
their greater forms, meaning they get the same colourblindness but
excellent darksight.
2017-01-25 23:06:30 -05:00
Fox-McCloud 4f72f89ad8 podmen fix 2017-01-23 08:05:55 -05:00
Fox-McCloud 5c828db250 fixes, comfrey, and aloe 2017-01-23 05:25:42 -05:00
Fox-McCloud 7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Crazy LemonandGitHub 37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak 1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Alffd ed727b4a7c Ports MarsM0nd's RIG suit fixes.
Ports MarsM0nd's RIG suit fixes.
2017-01-14 17:06:44 -05:00
Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
2017-01-11 23:11:29 +01:00
Crazylemon64 bfdd22dcd9 Fixes a few limb removal runtimes 2017-01-10 18:59:33 -08:00
Crazy LemonandGitHub f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework
Food rework
2017-01-10 12:11:17 -08:00
Kyep 43aaf4a8d9 Tiger requests 2017-01-07 16:07:43 -08:00
Markolie 55278aa0ee Fix VoG runtime 2017-01-07 23:48:55 +01:00
Markolie 46813b285e Adds the Voice of God, fix up font-size CSS 2017-01-07 23:43:32 +01:00
Kyep e5ab12acd0 PR 2 Creation 2017-01-07 00:18:43 -08:00
Fox McCloudandGitHub 5a01a6c7d3 Merge pull request #5840 from Crazylemon64/adds_reset_perspective
Polishes up `reset_view`
2016-12-23 07:27:36 -05:00
Crazylemon64 339a187f9f Fixes vision updates such as implants and similar 2016-12-21 17:59:08 -08:00
Crazylemon64 6d3e66f41c Polishes up the reset_view proc, which is basically
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Tigercat2000 27278ca2b1 Fix xenomorph organ surgery (properly) 2016-12-21 07:16:13 -08:00
Fox-McCloud e134100164 Hunger Rework 2016-11-28 13:17:46 -05:00
Crazy LemonandGitHub 405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization
Reagent Reorganization
2016-11-21 16:54:41 -08:00
TheDZDandGitHub 220ed7b27b Merge pull request #5872 from Fox-McCloud/bsa
BSA Tweaks
2016-11-13 20:27:27 -05:00
Fox-McCloud fcc20ac6bc BSA Tweaks 2016-11-09 22:36:03 -05:00
KasparoVy 0f1ae264f8 Resolves a runtime with alt icons.
The runtime occurred when get_icon_state() attempted to handle_alt_icon
on a head, even if if was a stump. Adds sanity to check if it's a stump
or if the organ's destroyed (as how it's handled in update_icons for
mobs) and resolves the runtime and #5863.
2016-11-09 04:28:51 -05:00
Fox-McCloud 14e2eb8eb0 consumables 2016-11-08 10:26:29 -05:00
Fox McCloudandGitHub 911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
KasparoVy b8c6e5c6e5 Fixes 2 Bugs with PR #5416
First bug: Changing your alt head in CMA wouldn't update it correctly.
You had to proc update_body(1, 1) twice in order to do it because of
where the head_organ.handle_alt_icon() proc call was placed in
organ_icons. Resolved

Second bug: Lack of sanity and inability to select head marking styles
with "all" alt heads allowed. Resolved
2016-10-23 23:14:53 -04:00
Fox McCloudandGitHub 45ba4d157a Merge pull request #5416 from KasparoVy/tail_markings_mark2
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-10-23 19:29:54 -04:00
Crazylemon64 6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
CodingaleandGitHub 79b527d82b Modify to implied src
Corrected typo in comment. Modified not to use src.
2016-09-24 08:55:33 -04:00
CodingaleandGitHub f231f8f27a Update blood.dm
Conform to agreed upon standards.
2016-09-23 17:10:42 -04:00
Codingale 4beac970c6 Fixes #5673 2016-09-23 16:49:20 -04:00
KasparoVy 1373070b98 More Conflict Resolution 2016-09-03 21:29:10 -04:00
Krausus cd4cb5df0a Fixes wound cleanup timer runtime 2016-08-30 01:23:37 -04:00
TheDZD f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
KasparoVy 1c407a36a1 Sorts out some runtimes, adds randomization for a bunch more stuff in character preferences, adds species validation to undergarments, adds absolute pathing to sprite_accessories and repaths alot of stuff.
Also corrects some oversights.
2016-08-27 09:22:01 -04:00
Fox McCloudandGitHub 4f590f27c4 Merge pull request #5537 from Crazylemon64/debug_log_to_error_viewing
Moves from `log_debug` to `log_runtime` for non-fatal abberant states
2016-08-26 21:15:31 -04:00
KasparoVy cd9b12086b Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories 2016-08-26 02:28:47 -04:00
Fox McCloudandGitHub 8cd9e4864b Merge pull request #5522 from Crazylemon64/airlock_wire_runtime_fix
Fixes a runtime when an airlock set to `autoclose` is deleted
2016-08-25 22:55:59 -04:00
Crazylemon64 16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output
more visible at runtime, to someone who isn't watching DD first-hand
2016-08-24 09:55:19 -07:00
Crazylemon64 b633cf53af Moves from log_debug to log_runtime for non-fatal abberant states 2016-08-23 17:03:52 -07:00
KasparoVy e0bad95adc Adds Some Markings and a Vulp F.Hair Style, Fixes Preferences Marking Randomization, Fixes Species-change thru CMA Bug, Fixes Vulp Kita F.Hair Style Colouring, Fixes Fatness and Deformation.
Previously, your markings would only randomize if you clicked the randomize button and were of a species that had body markings. Fixes that and tidies up the proc calls for marking randomization a bit.

Furthermore, a bug existed where if you changed a mob's species via CMA, the mob's cosmetic attributes (hair, hair colour, skin colour, skin tone, marking styles and colours, head accessory style and colour) will not have changed correctly. Delaying appearance update fixed that.

Finally, a mob's body will now correctly render as fat if they become fat and skinny if they become skinny and show deformities immediately.
Further explaining this fix: It required an override to be implemented in update_body that re-cached the mob's bodyparts in order to reflect changes to the limbs (i.e. fatness/slimness).
As for deformation, I just needed to modify the existing update_body() proc call.
2016-08-23 09:06:03 -04:00
Crazylemon64 7a75910bb0 Peoples' limbs are no longer given a wound cleanup timer if they don't
need it
2016-08-23 02:50:51 -07:00
Crazylemon64 38adc54c77 Humans no longer spew debug messages when deleted 2016-08-22 23:40:57 -07:00