100 Commits

Author	SHA1	Message	Date
Cadyn	07775449d7	Fixing conflicts	2020-10-05 18:10:53 -07:00
listerla	2b600cbe85	Changes default skin tone from 35 to 110	2020-09-05 11:09:18 -04:00
Razgriz	f00fdebbb9	Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull ... August2020UpstreamPull	2020-08-09 02:58:18 -07:00
Rykka	62e9c9c609	Earlyports Hair Gradients + Fixes for them! ... Earlyports: https://github.com/VOREStation/VOREStation/pull/8445 and https://github.com/VOREStation/VOREStation/pull/8353 and https://github.com/VOREStation/VOREStation/pull/8360 Example image: 	2020-08-04 16:35:01 -04:00
izac112	1456af50f7	Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac	2020-07-14 00:21:02 +02:00
Leshana	c59cb0cda4	Fix indentation syntax error. (#7320) ... Bad extra indent causes compile failures on strict DM compilers. Breaks linting.	2020-07-07 02:42:31 -04:00
Layne	989ca48282	ice cream	2020-07-04 00:37:03 -04:00
Layne	7b7a1b853e	ice cream	2020-07-01 18:56:09 -04:00
Atermonera	5fbc4f3189	Merge pull request #7304 from KillianKirilenko/kk-bio ... Offload Defibrillatability from NO_SCAN	2020-06-25 15:44:49 -04:00
izac112	79abbcbc2f	Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac	2020-06-03 18:30:13 +02:00
Atermonera	9a6b5a71f3	Streamline (Facial) Hair & Marking Character Customization, Port color_square to Clean Prefcode	2020-05-30 14:10:54 -04:00
izac112	e807b80281	Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac	2020-05-27 20:10:55 +02:00
Leshana	fb532ac920	Refactor Character Setup to use MAP ... - Instead of using expensive getFlatIcon() calls, character previews are now shown using screen objects in a second map window. - Edited skin to add a named window for preferences setup that contains a browser plus a new map window to show the previews. - Mannequins are still generated the same way, but now a MA is applied to four screen objects which are shown in the second map window. - The screen objects are deleted on close of the preferences window. So we do make sure to close it when spawning.	2020-05-21 19:04:56 -04:00
izac112	2b3fc9a740	Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate	2020-05-11 18:20:43 +02:00
Aronai Sieyes	d172e2dd04	Cached version of icon_states() proc	2020-05-06 16:06:44 -04:00
SplinterGP	6b1cb4e1ff	Adds haemophilia too and reset button	2020-05-05 20:53:41 -03:00
SplinterGP	3ad4e4a535	Disabilities out of trait system	2020-05-05 15:46:30 -03:00
Repede	7f1a6d6cc7	Fuck this shit ... Merge branch 'release' of https://github.com/VOREStation/VOREStation # Conflicts: # code/controllers/autotransfer.dm # code/controllers/subsystems/inactivity.dm # code/game/area/Away Mission areas.dm # code/game/area/Space Station 13 areas.dm # code/game/jobs/job/captain.dm # code/game/jobs/job/civilian.dm # code/game/jobs/job/security.dm # code/game/jobs/jobs.dm # code/game/machinery/air_alarm.dm # code/game/machinery/suit_storage_unit.dm # code/game/machinery/suit_storage_unit_vr.dm # code/game/mecha/combat/gorilla.dm # code/game/turfs/simulated/dungeon/wall.dm # code/game/turfs/simulated/wall_types.dm # code/modules/client/preference_setup/loadout/loadout_utility_vr.dm # code/modules/clothing/glasses/glasses.dm # code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm # code/modules/clothing/spacesuits/void/void_vr.dm # code/modules/clothing/under/accessories/holster.dm # code/modules/mob/language/station_vr.dm # code/modules/mob/living/carbon/human/emote_vr.dm # code/modules/mob/living/carbon/human/species/station/station_vr.dm # code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm # code/modules/mob/new_player/sprite_accessories_vr.dm # code/modules/power/apc.dm # code/modules/power/lighting.dm # code/modules/resleeving/machines.dm # config/jobwhitelist.txt # icons/mob/species/seromi/head.dmi # icons/mob/species/seromi/suit.dmi # icons/mob/species/vulpkanin/helmet.dmi # icons/mob/species/vulpkanin/suit.dmi # maps/tether/submaps/_tether_submaps.dm # maps/tether/tether_areas2.dm # maps/tether/tether_defines.dm # maps/tether/tether_shuttles.dm # nano/templates/apc.tmpl # vorestation.dme	2020-04-04 14:37:55 -04:00
Aronai Sieyes	9bbfd211a3	Vorestation edit fixes	2020-03-15 15:17:27 -04:00
Atermonera	cb8548f5af	Fully Implements R_EVENT for Event Managers	2020-03-12 15:01:50 -04:00
SplinterGP	55a8639c67	Fix to other species being able to wingdings	2020-03-06 14:45:53 -03:00
SplinterGP	7e20d0a63f	Fixes a <b> that should not be there	2020-03-05 23:14:03 -03:00
SplinterGP	bc690976cd	Adds YW comments	2020-03-05 22:55:28 -03:00
SplinterGP	7c493f73f6	Adds grey speech problem ... adds a speech problem that causes grey speak to be completely messed.	2020-03-05 22:24:22 -03:00
Arokha Sieyes	47ccc655db	Deprecate the stream operator	2020-02-12 19:38:43 -05:00
Atermonera	3b7a737c08	Change various global species lists to GLOB versions, adds 2 more event subspecies.	2019-12-16 00:52:29 -05:00
Mechoid	169d8acedd	Medical Expansion	2019-10-19 23:28:38 -04:00
Novacat	942b4d8caf	Merge pull request #5548 from Screemonster/specieslinks ... Adds quick wiki links to species pages	2019-08-03 08:44:35 -04:00
Heroman	e844f55f96	Fixes missing vorestation edits	2019-08-03 07:47:59 +10:00
Heroman	687fd0fc75	Allows players to select, customize and save whitelisted characters without whitelist	2019-08-03 06:59:00 +10:00
Screemonster	1af24b1496	Adds quick wiki links to species pages	2019-08-02 12:49:08 +01:00
Unknown	d13e8ee784	Critical Fixes ... - Fixes HREF Exploit - Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes - Port of https://github.com/PolarisSS13/Polaris/pull/6180 and https://github.com/PolarisSS13/Polaris/pull/6178 - Fixes #5272	2019-05-26 23:58:56 -04:00
Neerti	fe0b7373b3	Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it	2019-03-27 14:49:30 -04:00
Arokha Sieyes	b099ac6e4c	Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 ... # Conflicts: # code/__defines/holomap.dm # code/__defines/mobs.dm # code/_helpers/icons.dm # code/_helpers/unsorted.dm # code/_onclick/hud/hud.dm # code/_onclick/item_attack.dm # code/controllers/Processes/supply.dm # code/controllers/subsystems/planets.dm # code/datums/supplypacks/munitions.dm # code/datums/supplypacks/science.dm # code/datums/supplypacks/security.dm # code/datums/supplypacks/supply.dm # code/game/area/Space Station 13 areas.dm # code/game/atoms_movable.dm # code/game/machinery/autolathe.dm # code/game/machinery/doors/door.dm # code/game/machinery/jukebox.dm # code/game/machinery/recharger.dm # code/game/machinery/vending.dm # code/game/mecha/equipment/tools/medical_tools.dm # code/game/mecha/equipment/weapons/weapons.dm # code/game/objects/items/devices/PDA/PDA.dm # code/game/objects/items/devices/megaphone.dm # code/game/objects/items/poi_items.dm # code/game/objects/items/weapons/implants/implantlanguage.dm # code/game/objects/items/weapons/storage/firstaid.dm # code/game/objects/items/weapons/tools/weldingtool.dm # code/game/objects/structures/flora/trees.dm # code/game/objects/structures/plasticflaps.dm # code/game/supplyshuttle.dm # code/game/turfs/simulated/wall_attacks.dm # code/modules/admin/admin_verbs.dm # code/modules/assembly/infrared.dm # code/modules/client/client procs.dm # code/modules/client/preference_setup/loadout/loadout_utility.dm # code/modules/client/preferences.dm # code/modules/clothing/suits/miscellaneous.dm # code/modules/holomap/holomap_datum.dm # code/modules/holomap/station_holomap.dm # code/modules/integrated_electronics/core/printer.dm # code/modules/mining/machine_processing.dm # code/modules/mob/living/carbon/human/human_defense.dm # code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm # code/modules/mob/living/death.dm # code/modules/mob/living/silicon/ai/ai.dm # code/modules/mob/living/silicon/pai/pai.dm # code/modules/mob/living/silicon/robot/robot.dm # code/modules/mob/living/simple_animal/animals/parrot.dm # code/modules/mob/mob_movement.dm # code/modules/organs/organ_external.dm # code/modules/organs/organ_icon.dm # code/modules/organs/subtypes/standard.dm # code/modules/planet/weather.dm # code/modules/power/cable.dm # code/modules/power/fusion/core/core_control.dm # code/modules/power/fusion/fuel_assembly/fuel_control.dm # code/modules/power/fusion/gyrotron/gyrotron_control.dm # code/modules/projectiles/gun.dm # code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm # config/names/first_name_skrell.txt # config/names/last_name_skrell.txt # icons/mob/head.dmi # icons/mob/robots.dmi # icons/mob/species/tajaran/helmet.dmi # icons/obj/ammo.dmi # icons/obj/gun.dmi # icons/obj/mining.dmi # icons/obj/projectiles.dmi # icons/obj/rig_modules.dmi # icons/obj/surgery.dmi # icons/turf/walls.dmi # maps/southern_cross/southern_cross-1.dmm # maps/southern_cross/southern_cross-3.dmm # maps/southern_cross/southern_cross-6.dmm # maps/southern_cross/southern_cross-8.dmm # maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm # maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm # maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm # maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm # maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm # maps/submaps/surface_submaps/mountains/deadspy.dmm # maps/submaps/surface_submaps/mountains/mountains_areas.dm # maps/submaps/surface_submaps/plains/Thiefc.dmm # maps/~map_system/maps.dm # vorestation.dme	2018-09-27 18:01:09 -04:00
Atermonera	f2ac15be91	Merge pull request #5511 from Anewbe/descriptors ... Ports character physical descriptors from Bay	2018-09-17 11:21:28 -07:00
Anewbe	4fc94a6e47	Ports descriptors from Bay	2018-08-19 22:32:44 -05:00
Anewbe	e1471886d8	Fixes the bug(s) that allow meat bodies to have metal brains	2018-08-14 23:12:43 -05:00
KasparoVv	1f236a1d2e	Adds Marking Order Changing at Character Creation (#5429) ... * Adds Changing Order of Markings Clicking the back button on a marking will trade its place with the previous marking or move it to the end of the list if it's the first marking. Clicking the forward button on a marking will trade its place with the next marking or put it in first before all other markings if it's last in the list. * Changelog Adds changelog. * Buttons Only for >1 Marking Only renders the layer-swap buttons when there is more than one body marking. * Changes Button Labels to Proper Up/Down Arrows Thanks Atermonera!	2018-07-22 21:35:22 -04:00
KasparoVv	d59612028e	Adds Marking Order Changing at Character Creation (#5429) ... * Adds Changing Order of Markings Clicking the back button on a marking will trade its place with the previous marking or move it to the end of the list if it's the first marking. Clicking the forward button on a marking will trade its place with the next marking or put it in first before all other markings if it's last in the list. * Changelog Adds changelog. * Buttons Only for >1 Marking Only renders the layer-swap buttons when there is more than one body marking. * Changes Button Labels to Proper Up/Down Arrows Thanks Atermonera!	2018-07-22 18:34:52 -07:00
Anewbe	5fff00c4d5	Adds an option to enable/disable markings on synth parts.	2018-07-08 17:36:41 -04:00
Verkister	3b3a4ae19f	Adds an option to enable/disable markings on synth parts. ... -In char setup near the synth color option. -Tested working although the preview icon may misbehave with the icon cache. (Meaning the effect will require refreshing the cached icon with a visual change, such as color, markings, limb status change, etc. to show up, and may not show up at all if the appearance is identical to an earlier one already saved to cache and getting loaded from there instead of refreshing.)	2018-07-07 10:46:18 +03: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