Commit Graph
1961 Commits
Author SHA1 Message Date
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
uraniummeltdown 8c10df3bd3 adds AI control beacons to exofab, mechs with these installed can be controlled by any AIs
adds diag hud icons for mechs with tracking beacons installed
2017-01-31 20:14:05 +04:00
Tigercat2000 4e56bb9636 Add slot_collar, remove simple_animal add_inv/remove_inv
This is being done to remove the simple_animal/Topic() override.
2017-01-29 13:26:54 -08: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 51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -05:00
Crazy LemonandGitHub 0959e819ec Merge pull request #6237 from Fox-McCloud/no-pooling
Fires all Lifeguards, Bans Diving, and Forbids Swimming...
2017-01-26 03:48:35 -08:00
Crazy LemonandGitHub 0e42e416b6 Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08: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
Markolie 14fd8ec3ec Final station goal changes 2017-01-25 02:43:58 +01:00
Markolie 62afefaf2c Further station goal fixes, fix communication computer messages 2017-01-24 22:07:12 +01:00
Markolie a06c997629 Add Station Goals
Still to-do:
* Remove old BSA computer.
* Add NanoUI interfaces for all goals.
* Test it.
2017-01-23 22:02:29 +01:00
Fox-McCloud ea15a83fde Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage 2017-01-23 01:56:47 -05:00
Markolie d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01: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 deba5d8b95 Merge pull request #6170 from Fox-McCloud/species-lever-options
Adds Species Levers
2017-01-18 15:35:17 -08:00
Krausus f41069b8c1 Fixes force-feeding full people pills/patches
Pills/patches now ignore fullness when being used on others, just like
they do when used on yourself.
2017-01-16 04:31:50 -05:00
Fox-McCloud ea8080e6c9 Makes Reagents Holder Process and Refactors NOREACT 2017-01-14 20:09:49 -05:00
Fox-McCloud 56f0d79f15 Adds Species Levers 2017-01-14 03:51:43 -05:00
Fox McCloudandGitHub 2aa86d8777 Merge pull request #5704 from uraniummeltdown/lingfixesspecies
Changeling Changes
2017-01-13 15:50:17 -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
uraniummeltdown 7667112d6f changed lingprotect flag to notranssting, no injecting vox or plasmaman dna, plasmamen can be ling and affected by powers 2017-01-10 22:13:19 +04:00
Crazylemon64 66f2d40afa Giant Spiders no longer clog up the Alien role channel 2017-01-09 13:38:34 -08:00
Markolie f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Crazy LemonandGitHub 7e0183f23f Merge pull request #5224 from Kyep/jobs_unlock_system
Playtime Tracking
2017-01-03 18:06:28 -08:00
Crazy LemonandGitHub eb07245894 Merge pull request #6027 from KasparoVy/le-film-noir-est-fini
Returns Colour Vision when you Unequip Noir Glasses
2016-12-29 18:57:03 -08:00
Markolie 8609157751 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/_globalvars/mapping.dm
#	code/game/objects/effects/landmarks.dm
2016-12-30 00:17:56 +01:00
KasparoVy 0ec94ab50e Improves maintainability of Noir Glasses. 2016-12-25 00:49:46 -05:00
Aurorablade e25ddf8329 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-24 00:18:40 -05:00
Markolie 01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2016-12-23 19:32:19 +01: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
Fox McCloudandGitHub a80b0feae1 Merge pull request #5879 from KasparoVy/glasses_handling_properly
Adds switch-layer rendering functionality for f.hair, glasses and head accessories.
2016-12-09 18:22:27 -05:00
Fox McCloudandGitHub 1c43121f30 Merge pull request #5954 from Markolie/aieye
[s]Prevents AI units from clicking on things they can't see
2016-12-07 10:49:36 -05:00
Markolie b1a4195b40 Fix up \ref's 2016-12-07 07:53:20 +01:00
Aurorablade 19925a3313 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-06 21:22:16 -05:00
Markolie 73af7f94b8 Prevents AI units from clicking on things they can't see 2016-12-06 13:13:46 +01:00
Kyep 46d1fbaee1 Fixes new merge conflict from patreon PR 2016-12-02 22:53:08 -08:00
Aurorablade 2dc1a48f35 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-12-01 22:38:35 -05:00
Fox-McCloud c70e69004c Timer Controller Update 2016-11-30 17:50:16 -05:00
KasparoVy 71bf84b4a9 Merge remote-tracking branch 'upstream/master' into glasses_handling_properly 2016-11-29 17:34:10 -05:00
Kyep 7b20d7561e Merge remote-tracking branch 'ParadiseSS13/master' into jobs_unlock_system 2016-11-28 22:19:27 -08:00
Tigercat2000 8ae9bb457c Merge remote-tracking branch 'upstream/master' into patreon
# Conflicts:
#	code/__DEFINES/misc.dm
2016-11-26 16:48:07 -08:00
KasparoVy 64a2e876a7 Adds switch-layer rendering functionality for facial hair, glasses and head accessories. Glasses will now overlay hair only in certain circumstances.
Hair that is short (has glasses_over set) will have glasses rendered on top of it rather than the default behaviour of below it.
2016-11-12 12:08:45 -05:00
Tigercat2000 e997207d1f Patreon Modifications
- Adds a `donators` table for our patreon supporters.
   - Intended to be half-automated, half-manual, in order to correlate
     patreon accounts to ckeys. Uses the `active` field so that supporters
     don't have to have their ckey associated every time they stop and
     restart their donations.
 - Current actions:
   - Donators at tier 1 or greater get a palm tree next to their name in OOC
     (toggleable)
   - Donators at tier 1 or greater get +5 loadout points.
     - Known issue: Loadout points will not update if the table is
       modified during a round where the user has already logged in, due
       to preference datum caching. There's not really any good way to fix
       this, unfortunately.
2016-11-11 08:29:15 -08:00
Mark van AlphenandGitHub 4ae1855a64 Reduce cooldown to 0.5 seconds 2016-11-09 07:46:38 +01:00
Markolie 30f5874ca8 Reduce the cooldown to 1 second 2016-11-08 18:08:52 +01:00
Markolie 75176722e7 Add OOC throttling 2016-11-08 17:01:44 +01:00
Markolie 755a763439 Remove unused global var 2016-10-25 18:41:55 +02:00