Commit Graph

532 Commits

Author SHA1 Message Date
Leshana
4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24
# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm
2018-02-24 13:19:10 -05:00
Leshana
1d11b0d6e1 Create client preference for if hotkey mode is enabled by default on login or not.
* Adds preference setting for wether hotkeys should default to enabled or disabled.
* Fixes bug for CTRL+NUMPAD8 using old verb name for toggling head.
2018-02-23 14:16:53 -05:00
Aronai Sieyes
8080722399 Merge pull request #3097 from aztectornado/siren
Adds Siren jumpsuit
2018-02-22 19:32:09 -05:00
Aztectornado
105f986db1 Adds Siren jumpsuit 2018-02-22 06:00:41 -06: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
Leshana
7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
2018-02-17 00:35:29 -05:00
Anewbe
b34ee7d087 Merge pull request #4843 from PrismaticGynoid/universalponchos
Department ponchos for all
2018-02-16 12:52:27 -06:00
Aronai Sieyes
78d7ef1d72 Port Bay-style attack animations (#4827)
* POLARIS: Attack animations

* POLARIS: Overlay flick system

You can't do this in Byond, unfortunately, so here's some code from /tg/

* Make attack anims a preference
2018-02-15 22:02:04 -06:00
PrismaticGynoid
3e8109e8c6 Department ponchos for all
Removes the job restrictions on the department ponchos, making them able to be taken from the loadout by any job, just like the department jackets.
2018-02-15 16:26:55 -08:00
Arokha Sieyes
a88dfd0d20 Make attack anims a preference 2018-02-15 17:44:21 -06:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
2018-02-07 19:30:50 -05:00
Arokha Sieyes
686c601e24 Further translator tweaks 2018-02-04 13:56:25 -05:00
Arokha Sieyes
d0fc288df8 Removes several ways to know every language
Removes translators from loadout (departments still have them spawn for dealing with their work), removes EAL implant from loadout, remove omni language implant from R&D.

(Also fixes bug with soulcatchers that keeps the brains from hearing borgs, so you can still know all the languages while in a soulcatcher. So if you want to understand everything, get a translator in your head :p)
2018-02-04 13:03:49 -05:00
Cameron653
9e52040d5a Loadout Text-To-Speech device. (#4697)
* TTS Device

* Makes it a proper /device

* boop

* to_chat and message change
2018-02-03 22:47:01 -06:00
Isaac Erwin
5d53e8009e Loadout capitalization fixes
Because inconsistent capitalization triggers me
2018-01-31 20:31:41 -05:00
Leshana
6eec4063f3 POLARIS: No string compare for assistants 2018-01-30 21:44:00 -05:00
Aronai Sieyes
89f4e00e16 Merge pull request #2902 from VOREStation/vplk-pto
Quick bugfixes for assistant ->visitor/intern
2018-01-30 21:25:19 -05:00
Arokha Sieyes
3031dd8afa POLARIS: No string compare for assistants 2018-01-30 21:16:41 -05:00
Aronai Sieyes
6c2840ef9e Merge pull request #2895 from Verkister/doofle
Adds dufflebags and saddlebags to utility loadout.
2018-01-30 17:41:41 -05:00
Verkister
f3dc6add6c Update loadout_utility_vr.dm 2018-01-30 23:19:35 +02:00
Verkister
85e5731713 Adds dufflebags to loadout.
-Adds dufflebags to loadout, including normal, black(cosmetic), and department specific versions with appropriate access restrictions to utility category.
-Adds a cosmetic black duffle without the syndie speed buff.
-Moves taur saddlebags from accessories category to utility category.

Just a little preference QoL thing when you don't feel like scavenging and littering the station with discarded starter bags.
2018-01-30 13:14:39 +02:00
KotetsuRedwood
8106f27e96 Adds latex maid dresses to trash piles and loadout uniforms!
squrrrllk and other similar noises
2018-01-30 08:44:24 +00:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	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-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
Aronai Sieyes
88cab44124 Merge pull request #2848 from VOREStation/aro-exploration
Exploration Update
2018-01-27 15:32:42 -05:00
Arokha Sieyes
7366a1307c POLARIS: Sort jobs into correct departments
Also give cargo some color
2018-01-27 14:57:43 -05:00
Arokha Sieyes
b8d2766ee3 POLARIS: Sort jobs into correct departments
Also give cargo some color
2018-01-27 14:10:54 -05:00
elgeonmb
3d5740c909 adds an e-reader full of news to the loadout (#4619)
* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster
2018-01-25 18:18:35 -06:00
Arokha Sieyes
3140bcf8a2 Fix commlink being in loadout 2018-01-25 16:42:56 -05:00
Arokha Sieyes
9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
2018-01-22 12:10:19 -05:00
BillyBangles
bfeda4c28b properly names the communicator watch selector (#4601) 2018-01-20 21:32:44 -08:00
Leshana
3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-01-19 17:52:25 -05:00
BillyBangles
c44af58716 Adds communicator watch (take 2) (#4406)
* adds communicator watch

* adds commwatch to a loadout selection list

* adds changelog

just in case
2018-01-17 19:33:32 -06:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -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
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
65724afe58 Merge pull request #2687 from VOREStation/aro-sani
Fixes a couple of charsetup sanitizes
2018-01-05 14:22:07 -05:00
Arokha Sieyes
13b28ede55 Fixes a couple of charsetup sanitizes
No more "YOU DIDN'T SET A SCALEEEEE" on new characters. Defaults to 100%.
2018-01-05 12:28:15 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05: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
Atermonera
c9941e2450 S&R loadout spacing (#4486)
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Adds the disabled mech tools.

* indentation

* S&R is inline w/ explorer roles in char setup
2018-01-02 20:04:32 -05:00
Arokha Sieyes
e4d590f4e2 Add legwraps to loadout shoes list
They're for digitigrade people who wanna look stylish!
2017-12-27 14:49:32 -05:00
Cyantime
9e573e69fb Updates paths due to Polaris change 2017-12-25 22:31:01 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe
3b89c5e320 Merge pull request #4384 from Belsima/maid
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
2017-12-12 19:51:35 -06:00
Anewbe
393144068e Merge pull request #4427 from MisterLayne/fear_of_needles
Trypanohpobia
2017-12-12 19:30:01 -06:00
MisterLayne
ccc88ed9d1 Fear the needle (in that person's hand, too). 2017-12-12 16:18:33 -05:00
Anewbe
ff1103c7d9 Removes the military clothing from the loadout, repaths things 2017-12-07 21:21:05 -06:00
Belsima
bb6d52d13d Adds blennophobia. (#4397)
* Adds blennophobia.

* Adds blennophobia to character setup.

* fear updates
2017-12-05 23:51:36 -06:00