Commit Graph

310 Commits

Author SHA1 Message Date
Anewbe 5cfb443cce Communicator visibility is now on a per-character basis, rather than global 2018-04-21 17:08:39 -05:00
Leshana 6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-03-31 09:20:59 -04:00
Neerti 318762f091 Merge pull request #5088 from VOREStation/port-vs-catchup
VOREStation Ports Catchup
2018-03-22 22:32:09 -04:00
Arokha Sieyes 71dac8ae26 POLARIS: UI Tweak involving species rarity 2018-03-21 14:31:03 -04:00
Abbie Fland 6e9554baa2 Fixes preview color splotch blues
Due to what looks like a copy-paste error, previously it didn't pad the
blue hex value. This meant blue values of 1-15 would display as
e.g. "f0" instead of "0f" and looked nothing like the actual color.

Previously a dark grey of 15,15,15 would get a preview splotch of bright
blue; this fix makes the splotch display as the same dark grey used
ingame.
2018-03-21 00:56:02 +00:00
Leshana 7a94f18b26 Merge pull request #3248 from VOREStation/aro-rarity
UI Tweak involving species rarity
2018-03-16 19:41:59 -04:00
Arokha Sieyes c69b3b5d04 POLARIS: UI Tweak involving species rarity 2018-03-16 00:10:43 -04:00
Leshana a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-03-15 22:41:14 -04:00
Anewbe 5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Verkister 1bcbcc926d Preview background fixes and additions.
-Fixes flat white background capitalization error.
-Re-enables tunnel plating and reinforced floor.
-Adds darker plating, ribbed techmaint tiles, and flat middle grey.
-Tweaks their cycle order to cycle flats by shade, and then tiles by shade.
-Moves our update preview code underneath the polaris original.
-Polaris bg list update waiting for merge out there as well, but let me know anyway if I should do a temporary vorestation edit comment until next sync tho.
2018-02-20 09:52:56 +02:00
Verkister 014ebdc251 Preview background additions and a fix.
-Fixes flat white background capitalization error.
-Re-enables tunnel plating and reinforced floor. (turf versions now up to date)
-Adds darker plating, ribbed techmaint tiles, and flat middle grey.
-Tweaks their cycle order to cycle flats by shade, and then tiles by shade.
2018-02-20 09:40:49 +02:00
Arokha Sieyes ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
PrismaticGynoid 5ffb0ee7e7 Replaces NT Relation with Economic Status
Because starting money is pretty much all it affects, anyway. Instead of just being used to measure NT's opinion of you, you now choose income categories to fall under. This still affects how much money you start with, with the highest category giving a 1.3x modifier, but the lowest has been lowered to 0.5 times. Now you can start with even less money than before.

Currently doesn't change the "this person might be willing to help you" message for traitors, but it would be easy to do something different with that if requested.
2018-01-07 14:12:10 -08:00
Leshana 4906d5ca83 Fix exploit allowing choosing unlimited languages on character setup.
* Checks list length after input() returns so you can't cheese it.
* Sanitizes list to proper length so existing characters over the limit will be fixed.
2018-01-04 20:52:35 -05:00
killer653 11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Anewbe c68fb0861f Ports the background icons for char setup 2017-10-27 23:00:34 -05:00
killer653 0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Neerti ca84cd326a Merge pull request #4139 from Anewbe/nicknames
Adds the ability to choose nicknames
2017-10-23 13:37:34 -04:00
Anewbe 28c9c12837 Adds the ability to choose nicknames 2017-10-22 00:56:46 -05:00
Anewbe 79eb840538 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vatborn 2017-10-19 09:57:26 -05:00
killer653 1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Anewbe f42457b997 Starts work on the Vatborn Human species 2017-10-15 23:26:22 -05:00
shazbot194 d199d4caf7 Adds in the option to color all synth parts and two sets of parts
As the titles says
2017-10-15 14:56:14 -08:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe 9d5dd1cc48 Allows use of more internal prosthetic organs 2017-10-05 20:42:03 -05:00
killer653 58a85b059f Allows the ability to Ckey lock hair 2017-10-03 18:04:31 -04:00
Arokha Sieyes d9c845a298 Don't sanitize out Custom Species unless they are changing species 2017-05-29 17:19:03 -04:00
Arokha Sieyes 4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
Arokha Sieyes 85a489b9b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-04-04 20:25:00 -04:00
Anewbe b38986b4b7 Merge pull request #3209 from Atermonera/master
FBPs can have numbers in their names.
2017-04-03 13:56:06 -05:00
Atermonera 67d9f03e4d FBPs can have numbers in their names. 2017-04-02 13:53:49 -07:00
Leshana 6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe 29a25cc9b0 Merge pull request #3164 from Cerebulon/synth_brain_rename
Changes character setup to use correct in-lore names for brain types.
2017-04-01 16:00:19 -05:00
Cerebulon 98d3ebf6dd Fixed full options not showing up for non-FBPs. Repeated more thorough testing with newest changes. 2017-04-01 03:09:55 +01:00
Arokha Sieyes c828a85f06 Adds Body Markings - VOREStation Species
Vulps! And removes whitelist for parts.
2017-03-30 18:57:48 -04:00
Arokha Sieyes e116f08d24 Adds Body Markings
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.

The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.

They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
2017-03-30 18:05:20 -04:00
Cerebulon 2189d83812 Fixed single leftover 'cybernetic' and 'drone' variables. 2017-03-30 21:50:04 +01:00
Cerebulon 9e955cf999 Missed a spot. 2017-03-30 18:04:21 +01:00
Cerebulon 7773ef7122 Dialled back changes to only effect menu display text for brains.
Reverted variable names to original assisted/mechanical/digital to prevent potential issues in other code which may rely on them.
2017-03-30 18:01:20 +01:00
Cerebulon dfe5afe197 Changes character setup to use correct in-lore names for brain types. 2017-03-29 01:55:46 +01:00
Arokha Sieyes 9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Arokha Sieyes 52130160db Adds Body Markings
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.

The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.

They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
2017-03-26 19:36:34 -04:00
MagmaRam e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas
Adds rugged style PDAs
2017-03-22 19:42:19 -05:00
Arokha Sieyes 755bc0d7d1 Adds Serdy's Robobutt
Also adds a general cyberlimb whitelisting system since that's apparently needed now.

App: http://forum.vore-station.net/viewtopic.php?f=45&t=875
2017-03-04 17:25:17 -05:00
Arokha Sieyes 387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Neerti 12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Arokha Sieyes 5b257f55e3 Make OOC notes persistant
Even when logged out, or body swapped, or new bodies are printed.
2017-02-19 17:48:17 -05:00
Anewbe 79390b6177 Adds rugged style PDAs 2017-02-04 22:42:06 -06:00
killer653 3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00