6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# 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/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
1fc11fe8c5
Merge pull request #5187 from Anewbe/comms_tweak
...
Communicator visibility is now on a per-character basis, rather than global
2018-04-23 18:59:00 -07:00
8ac6b0bfe9
Fix Scree and Scree Accessories
2018-04-21 23:22:08 -04:00
5cfb443cce
Communicator visibility is now on a per-character basis, rather than global
2018-04-21 17:08:39 -05:00
c12368b887
Adds new robot codex ( #5178 )
...
* adds new robot codex
* appeases ater
2018-04-20 10:30:06 -07:00
2cba96cf4c
Switch to defines for custom species stuff
2018-04-19 19:34:10 -04:00
1a349f77dd
Cleans up custom species icon base code
...
Fixes #3478
2018-04-19 17:46:51 -04:00
a72abf203d
Merge pull request #3407 from Little-119/rings-fix
...
Changes wedding rings to be a subtype of ring
2018-04-08 07:26:38 -04:00
6ebe2269c4
Changes wedding rings to be a subtype of ring
...
Also moves them to their own .dm, since they're now a subtype of the thing in rings.dm. Also changed bethrothed to spouse, as the former is usually before marriage and not after.
Benefits of this include: Being able to wear gloves over wedding rings. Making them tiny instead of small. Making their gender neuter instead of plural, so it wont say "some wedding ring" when you examine someone wearing them. Probably more good things.
Issue reported by HzDonut.
2018-04-08 01:06:36 -04:00
8c3e41a705
Small fixes and ports discovered during merge. ( #5138 )
...
* POLARIS: No string compare for assistants
* POLARIS: Move these planes to more useful places
* POLARIS: Only spam ghosts with chat messages from things with real clients
* Fix small forgotten lines of text accidentally left out of VS syncs.
* Fix typo'd plane in lighting.dm and remove redundant definitions.
2018-04-04 17:35:15 -07:00
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
9a7f8b1953
Merge pull request #5093 from Neerti/3/21/2018_typing_fix
...
Cherrypicks missing typing indicator commit from Virgo
2018-03-23 21:40:00 -05:00
e0c0bacefb
Merge pull request #5084 from VOREStation/port-tooltips
...
Tooltip framework + Mob tooltips
2018-03-22 22:33:49 -04:00
318762f091
Merge pull request #5088 from VOREStation/port-vs-catchup
...
VOREStation Ports Catchup
2018-03-22 22:32:09 -04:00
f75ea72480
POLARIS: Improve robot and typing overlays
2018-03-21 21:03:13 -04:00
71dac8ae26
POLARIS: UI Tweak involving species rarity
2018-03-21 14:31:03 -04:00
eabec5fb1e
POLARIS: No string compare for assistants
2018-03-21 14:19:36 -04:00
62f9cb0d47
POLARIS: Fix tooltip style sanitize
2018-03-20 22:42:24 -04:00
de6da4a86c
POLARIS: Tooltip framework, and mob tooltips
2018-03-20 22:42:16 -04:00
1eac979525
Fixes blue color-preview splotches
...
VOREStation companion to Polaris fix in
https://github.com/PolarisSS13/Polaris/pull/5082
2018-03-21 01:06:29 +00:00
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
f75dbca44c
Fix HUD alignment on non-1.0 spawn scales
2018-03-18 19:33:11 -04:00
77e8d93e66
Merge pull request #3266 from VOREStation/aro-overlays2
...
Refactor typing overlay and robot overlays
2018-03-17 20:13:33 -04:00
2248c71b39
POLARIS: Improve robot and typing overlays
2018-03-17 19:49:03 -04:00
e82c19a31a
Probably fixes joining at wrong size
2018-03-17 14:53:36 -04:00
7a94f18b26
Merge pull request #3248 from VOREStation/aro-rarity
...
UI Tweak involving species rarity
2018-03-16 19:41:59 -04:00
718f89e848
Merge pull request #3249 from VOREStation/aro-tooltipfix
...
Fix tooltip style sanitize
2018-03-16 19:04:58 -04:00
821ee11272
POLARIS: Fix tooltip style sanitize
2018-03-16 00:11:38 -04:00
c69b3b5d04
POLARIS: UI Tweak involving species rarity
2018-03-16 00:10:43 -04:00
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
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
de9a37495c
Merge pull request #3225 from VOREStation/aro-tooltips
...
Tooltip framework + Mob tooltips
2018-03-12 21:28:06 -04:00
428db6c271
POLARIS: Tooltip framework, and mob tooltips
2018-03-12 18:25:53 -04:00
b7090d7df2
Adds Tajaran Akhani language. ( #5032 )
...
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.
* Gives the language a colour distinct from Siik.
* Changelog
2018-03-11 16:55:08 -05:00
3e92f000f7
Fixes the cancel button in ears/wings/tail selection clearing the respective selection
2018-03-11 04:29:07 -04:00
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
524c9aa5db
Removes translators from the loadout ( #4942 )
2018-03-01 12:00:37 -08:00
2935ec1ac8
Merge pull request #3149 from VOREStation/aro-sync
...
Polaris Sync
2018-02-27 21:48:52 -05:00
3fe17274d2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/ATMOSPHERICS/pipes.dm
# code/game/turfs/flooring/flooring.dm
# code/modules/clothing/clothing_accessories.dm
# code/modules/mob/living/carbon/human/inventory.dm
# html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
cf79159b31
Merge pull request #4967 from Atermonera/umbreload
...
Adds umbrellas to loadout, for 3 points
2018-02-27 14:48:04 -06:00
36236e1883
Sivian Western Sprite Pack ( #4970 )
...
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.
* Adds 2 cowboy boots and a stick horse. yeehaw.
* Attempting to squash conflict that was caused by one of my OWN prs. For shame.
* attempting to fix conflict ft. anewbe
2018-02-27 14:24:20 -06:00
f04c58f202
VS: Rewrites basically all of how bellies work
...
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
48c6161c4d
Adds umbrellas to loadout, for 3 points
2018-02-26 12:39:56 -08:00
643ba39d73
Prommie Cohesion Suits ( #4937 )
...
* Adds prommie cohesion suits. Still need tesh sprites + loadout.
* adds the tesh sprites + loadout option.
* Renammed cohesion suits & icon files.
* Almost forgot to adjust the bird file names. There we go.
* Removed redundant line
2018-02-25 11:26:02 -06:00
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
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
8080722399
Merge pull request #3097 from aztectornado/siren
...
Adds Siren jumpsuit
2018-02-22 19:32:09 -05:00
105f986db1
Adds Siren jumpsuit
2018-02-22 06:00:41 -06:00
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
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