Commit Graph

282 Commits

Author SHA1 Message Date
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Cebutris
9bde77ed63 ringtone >> ttone 2020-01-23 18:44:00 -05:00
Cebutris
70fa53cb2c beep 2020-01-22 02:59:41 -05:00
Novacat
3129c2a85b Update preferences.dm 2019-03-28 21:34:11 -04:00
Neerti
e2557228dc Copy character slots 2019-03-08 20:17:46 -05: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
Anewbe
4fc94a6e47 Ports descriptors from Bay 2018-08-19 22:32:44 -05: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
Verkister
91f250af3b Adds an option to disable markings on synth limbs.
-You can now have clean robolimbs on your artfully painted organic bodies again.
-In char setup near the synth color option.
-Tested working although it requires a physical change (colors, markings, limb status, etc.) to refresh the body cache before it can show up in preview.
2018-07-05 14:31:29 +03:00
Arokha Sieyes
8f876de645 Adds a client FPS setting 2018-05-07 23:37:47 -04:00
Arokha Sieyes
fe5633e3d8 Adds a client FPS setting 2018-05-07 23:36:47 -04:00
Arokha Sieyes
0e2f41ea86 More optimizations for character joins 2018-04-02 16:49:44 -04:00
Arokha Sieyes
de6da4a86c POLARIS: Tooltip framework, and mob tooltips 2018-03-20 22:42:16 -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
Arokha Sieyes
428db6c271 POLARIS: Tooltip framework, and mob tooltips 2018-03-12 18:25:53 -04:00
Arokha Sieyes
53a185f838 U_I Phase 2.0: Code cleanup
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
2018-03-08 19:33:44 -05:00
Arokha Sieyes
55ba550409 More optimizations for character joins 2018-02-17 23:24:11 -06:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Arokha Sieyes
f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Arokha Sieyes
10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
PrismaticGynoid
10b2cc7eef Multiple loadout slots (#4530)
* Multiple loadout slots

Ported from Bay. Each character can have 3 (number can be overridden by config) loadout slots. This way, you can have different outfits for different situations without needing to have a separate character slot or edit your loadout every time.

Tested here, works as intended. The current loadout is set as slot 1, so you don't need to worry about remaking it. This also ports the to_file and from_file macros to make it work, I'm assuming they could later be used elsewhere as well.

* Log of Changing
2018-01-14 14:47:47 -06: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
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe
28c9c12837 Adds the ability to choose nicknames 2017-10-22 00:56:46 -05:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04: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
Neerti
a8513844ec Adds a Trait system (#4048)
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Belsima
18346b864a The new default for 'if you don't get your job' is assistant. 2017-09-18 10:15:06 -04:00
Leshana
9c32a6dc0a Fixes un-sanitized preferences runtimes
* Puts back in code that sanitized preferences after loading, it was overwritten in polaris sync commit 3f1e5c80f2
* Also removes a VOREStation Edit comment on lines that were no longer different from Polaris, introduced at the same time.
* Fixes Runtime in 02_language.dm,21: Cannot read null.language
2017-06-12 23:20:33 -04:00
Arokha Sieyes
4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -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
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
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
b50190d762 Merge pull request #2934 from Anewbe/char_reset
Ports Bay's character resets
2017-01-27 20:44:54 -06:00
Neerti
14c67e0893 Two bugfixes
Ghosts should be able to hear things once more.
The big bold NEW NEWS notice should remember if one has already seen the news, as the hash was not actually being saved.  It's being saved now.
2017-01-17 04:11:57 -05:00
Anewbe
5b1fc48712 Ports Bay's character resets 2017-01-16 19:02:41 -06:00
SinTwo
eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
2016-08-15 12:58:00 -04:00
SinTwo
f50adb9554 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
Conflicts:
	code/_helpers/time.dm
	code/modules/economy/ATM.dm
2016-08-09 15:46:24 -04:00
Eearslya
85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
PsiOmegaDelta
0f830b0f98 no message 2016-08-05 17:58:15 +01:00
SinTwo
0086d61d56 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
Conflicts:
	code/modules/client/client procs.dm
	nano/templates/robot_control.tmpl
2016-07-27 16:11:55 -04:00
Arokha Sieyes
59f6b7570a Merge pull request #398 from VOREStation/sync
Polaris Sync
2016-07-03 19:47:47 -04:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00
Spades
ea3f9c9aa2 Add human recoloring and clean up code 2016-06-29 20:37:02 -04:00
Datraen
ccda51ab68 Adds fluff antag factions, antag visibility options for uplinks.
No mechanical changes come of this change, only the ability to have an antagonist faction, as well as having specified visbility for the affiliation itself.
Also adds Skrell home system to the home system list.
2016-06-29 11:25:52 -04:00
SinTwo
4fa126b7e7 a whole lot of nanoui upgrades 2016-06-24 00:43:16 -04:00
Arokha Sieyes
0350a266d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/modules/client/preferences.dm
2016-06-14 12:01:42 -04:00