Commit Graph

455 Commits

Author SHA1 Message Date
Fox McCloud
616a0ff8d1 Merge pull request #6446 from Kyep/terrorspiders-PR3
Terror Spiders 3 - Awaymission & AI
2017-02-25 17:04:30 -05:00
Kyep
483da74982 Rebalances/buffs white spider 2017-02-17 23:34:35 -08:00
Krausus
4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Crazy Lemon
77a98d9a21 Merge pull request #6408 from KasparoVy/Fixing-VoxTailBug
Fixes Vox-tail Bug
2017-02-14 23:24:49 -08:00
KasparoVy
87aa937d8d Fixes a bug w/ frankenstein limbs and Excises mob icobase/deform so the organs handle it.
Fixes a bug w/ the first commit where frankenstein limbs got converted to the owner's appearance (icobase/deform) if the owner HAS_ICON_SKIN_TONE.
2017-02-14 21:39:40 -05:00
KasparoVy
6b50f16a12 Fixes Vox-tail Bug
When a new Vox spawns in, your tail won't suddenly break (become a
different colour).
Abstracts icobase/deform/tail from the species definitions a bit so
individual mobs can have a different icobase/deform/tail than other mobs
of the same species.
2017-02-12 02:28:15 -05:00
Kyep
9f20cb1685 Fixes merge conflict in event_container 2017-02-10 22:07:05 -08:00
KasparoVy
ef5376ede2 conflict resolution 2017-02-05 17:13:34 -05:00
Fox-McCloud
390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
Markolie
2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
Crazy Lemon
d7ae5c4a7e Merge pull request #6266 from Fox-McCloud/pill-fix
Fixes Dental Pill being an internal organ
2017-01-28 01:40:26 -08:00
KasparoVy
8be2693798 Minor Tweaks & Fixes
- Updated the flashlight eye-shine check with the new get_dark_view()
helper proc
- Removed a useless check on the handle_dna() for monkeys
- Increases reliability of the monkeyize() proc and fixes issues where
calling it wouldn't turn a mob into a monkey on the spot.
- Increases readability/maintainability of the get_colourmatrix() and
get_dark_view() procs.
2017-01-28 00:36:37 -05:00
Fox-McCloud
b24be686d0 Fixes Dental Pill being an internal organ 2017-01-27 20:02:06 -05:00
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 McCloud
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 Lemon
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 Lemon
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 McCloud
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 Lemon
405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization
Reagent Reorganization
2016-11-21 16:54:41 -08:00
TheDZD
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 McCloud
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 McCloud
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
Codingale
79b527d82b Modify to implied src
Corrected typo in comment. Modified not to use src.
2016-09-24 08:55:33 -04:00
Codingale
f231f8f27a Update blood.dm
Conform to agreed upon standards.
2016-09-23 17:10:42 -04:00