Commit Graph

471 Commits

Author SHA1 Message Date
Fox McCloud
f7f127042c Merge pull request #6679 from Kyep/terrorspiders-PR5
Terror Spiders 5 - Fixes & Tweaks II
2017-03-27 02:27:19 -04:00
TravellingMerchant
740d66f953 Adds the Shellguard parts to the code list. 2017-03-25 03:13:14 +00:00
Crazy Lemon
87e4993152 Merge pull request #6717 from Fox-McCloud/laser-scalpel-refactor
Fixes Power Tools Materials and Recators Laser Scalpels
2017-03-23 15:20:56 -07:00
Fox McCloud
7b16c169ff Merge pull request #6494 from Crazylemon64/risky_strange_reagent
Strange Reagent is now Riskier
2017-03-21 13:11:29 -04:00
Crazy Lemon
78d8248e72 Merge pull request #6800 from Fox-McCloud/surgery-fix
Fixes Abductor Surgery
2017-03-17 15:55:23 -07:00
Fox-McCloud
991bd8c702 Fixes Abductor Surgery 2017-03-17 18:28:23 -04:00
Mark van Alphen
93470e3570 Merge branch 'master' into zefix 2017-03-09 17:20:31 +01:00
Fox-McCloud
9e94f2ceeb Fixes Power Tools Materials and Recators Laser Scalpels 2017-03-09 02:08:42 -05:00
Markolie
8ed466955e Surgery toolspeed changes 2017-03-08 10:46:43 +01:00
Markolie
acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
Fox McCloud
5a9ff41464 Merge pull request #6591 from Crazylemon64/ipc_power_cord
Replaces the IPC APC grabbing thing with a power cord and lets IPCs be genderless
2017-03-07 22:25:11 -05:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Markolie
e6b39c3185 Fixes 2017-03-05 14:31:26 +01:00
Kyep
9b3153cabc Terror Spiders 5 - Fixes & Tweaks II
Fixes:
- Spiders can no longer get stuck in vents, because they coccooned a mob
on top of a pipe, and it broke the pipe. Similarly, spiders can no
longer coccoon anchored objects of any kind. Fixes bug #6221 properly.
- Spiders will no longer ignore mechs and space pods. This was leading
to people cheesing the away mission with a ripley and a mech-mounted
drill.
- Prince, Queen, etc in away missions no longer stand still like
statues. Grays still stay on their vents.
- White spider in away mission can no longer infect people in a way that
makes it possible to transfer spiderlings to the main station.
- White spider eggs no exist for two minutes longer than they should
after hatching from someone.
- Signs in the away mission no longer contain the text 'improper'.
- Spiderlings that hatch in the away mission with an opened queen lair
no longer get stuck.
- Two misplaced lights in the away mission have been fixed.
- Queen nests in the away mission which live for a very long time can no
longer depressurize their area by smashing walls.

Updates:
- Webs spun by white spiders will infect humans who are silly enough to
walk into them. Hardsuits protect against this.
- Spiders will now be quicker to open doors. This should stop them
getting hung up on doors they can open.
- Empress has been tweaked to have an 'erase brood' ability (wipes
infestation, for adminbus), and her spit does BURN instead of TOX.
2017-03-04 03:40:59 -08:00
Crazylemon64
98e23c3202 Replaces random disease with necrosis 2017-02-26 11:04:24 -08:00
Fox McCloud
616a0ff8d1 Merge pull request #6446 from Kyep/terrorspiders-PR3
Terror Spiders 3 - Awaymission & AI
2017-02-25 17:04:30 -05:00
Crazylemon64
0e10df68a1 Replaces the APC attack_hand code with a power cord organ
De-snowflaking IPCs one bit at a time
2017-02-25 00:41:18 -08: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