Commit Graph

468 Commits

Author SHA1 Message Date
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Arokha Sieyes
c7857a5bf3 Improves AR glasses, makes them available
Now you can start with them in loadout. They are no longer SUNglasses though, so they won't protect you from flashes.

There are several models, the loadout ones are the civilian ones.

- Civilian: Displays job ID icon based on the person's ID, and shows a health bar only if they are injured.
- Medical: Same as civlian, but displays advanced status (virus, borer, etc) along with backup implant status, and allows medical records access.
- Security: Same as civilian, but displays warrant and arrest status, and will automatically darken (electrochromic) in response to flashes, making the wearer immune, plus security records access.
- Engineering: Same as civilian, but will automatically darken to protect one's eyes during welding.
- Research: Same as civilian, but has a trendy goggle form factor for SCIENCE reasons.
- Omni: Has the combined features of all of the above. The only pair available spawns in the CD's office. (CC officers also)
2017-03-05 20:58:59 -05:00
Poojawa
ec3056466c Merge remote-tracking branch 'refs/remotes/VOREStation/master' into ds9-uniforms 2017-03-05 03:53:57 -06:00
Poojawa
5fdbaceb44 ds9 overcoats 2017-03-05 03:53:55 -06:00
Arokha Sieyes
ffac4f72ba KIN -> KHI Renames
They don't have a Navy, I dunno why I put that. Also checks the file that SOMEONE keeps forgetting to check.
2017-03-04 22:14:45 -05:00
Arokha Sieyes
97ca5c2542 Merge pull request #1062 from VOREStation/aro-030217sync
Polaris Sync
2017-03-03 14:29:40 -05:00
JoanRisu
7653763fc4 Merge pull request #1059 from Poojawa/trekuniforms
trek uniforms + loadout listing
2017-03-03 01:05:53 -08:00
Poojawa
7891bf2b52 Trek Uniforms 2017-03-03 02:51:05 -06:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Anewbe
25b925f04c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Poojawa
c062a0cfe1 trek uniforms + loadout listing 2017-03-02 12:00:19 -06:00
Yoshax
94294f0a3f Colorable loadout items 2017-03-02 12:56:09 +00:00
Yoshax
ead56a1776 Fixes a loadout issue 2017-02-26 14:28:44 +00:00
Yoshax
a07033fd15 Fixes loadout stuff 2017-02-22 01:08:58 +00:00
Anewbe
2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Yoshax
c31100f134 Adds Vox loadout stuff 2017-02-21 14:54:16 +00:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Anewbe
7417bef794 Boots are now a subtype of shoes 2017-02-05 16:17:41 -06:00
nachomeep
c2ed062b3f Fixes custom loadout and slot system. 2017-02-02 15:37:27 -05:00
nachomeep
c81b18b40a adds fannypacks
To custom loadout as well.
2017-02-01 18:31:49 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
OrbisAnima
16a44b75bd Swimsuits for All! Fluff items for some
-Added swimsuits to be picked in the loadout, since I created a special
container for them, they wont replace the uniform you spawn with. They
can be found in uniforms and suits!

-Added Xsdew departamental selection of swimsuits! (Security, Medbay,
Science and Engineering)

-Added Xsdew Fluff swimsuit!
2017-01-29 11:10:00 -03:00
Anewbe
09ce761931 Adds Medical and Meson Aviators 2017-01-26 22:25:37 -06:00
Anewbe
00dfa331f3 Renames SCG Expeditionary Corps to Sif Homeguard Corps (SifGuard) 2017-01-14 18:06:31 -06:00
killer653
9c359cb202 Polaris sync 2016-12-27 08:21:55 -05:00
Anewbe
5c41c32dc9 Adds device cell to the loadout 2016-12-15 18:19:48 -06:00
Anewbe
6d7d5af896 The TSC jumpsuits should be properly selectable now. 2016-12-11 16:50:04 -06:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
MagmaRam
7e1e710df5 Merge pull request #2847 from Woodratt/1.6.6_shoes_n_gloves
1.6.6 shoes and gloves
2016-12-09 22:53:32 -06:00
woodratt
ad92bc899b 1.6.6 shoes and gloves
Adds shoes and gloves from Bay.

Forensic gloves added to the loadout, detective only.
Work gloves added to the loadout.
Tactical gloves added, not to loadout.
Cowboy boots added (existing sprite, loadout)
Jungle boots and Duty boots added, (loadout).
Dress shoes added white and black, (loadout).
Fixed pathing issue with purple beret.
2016-12-08 20:59:04 -08:00
Anewbe
bf9c76ee3c Merge pull request #2839 from MagmaRam/EAL_implant
Adds an implant that allows humans to speak EAL.
2016-12-07 21:39:45 -06:00
MagmaRam
c5b77fcf9e Adds an implant that allows humans to speak EAL.
It's available in the loadout for 2 points.
2016-12-01 22:22:46 -06:00
woodratt
5444a4ad52 1.6.5 Port of Bay's uniforms
- Port of all of the uniform items that we did not have.
- Aether, Sweater, Ward-T. Frontier, Focal, Heph. Grayson, M. Bill, PCRC outfits/uniforms ported. (Loadout, some restricted)
- All of the military jumpsuits and uniforms have been ported. (Not Avail).
- Plain utility outfits are available in the loadout, as well as the pt outfits (except for marine).
- Hazard, Sterile, Saare, and Confederate outfits ported. (Not Avail).
2016-11-29 03:07:18 -08:00
woodratt
6dd5c9d657 1.6.4 Port of Baystation head items.
- Port of baystation head slot items. Some in hand sprites created for a few (soft caps). A couple other sprites adjusted so they fit more hairstyles.

- Sol berets. (Loadout)
- Baseball caps, major bills, sol, fleet, expeditionary (Loadout)
- helmets, merc, tact, sol, nt. (Not Avail)
- Utility, wheelcaps, garrison, drill, dress. (Not Avail)
- Resprites for the detective's fedoras.
- Four custom welding hoods, (Loadout, access restricted).
- Two new cowboy hats, taken from Europa code. (Loadout)
2016-11-26 15:57:15 -08:00
woodratt
454e6870d9 1.6.3 Ports of Bay's suit clothing
- Whole scale port of clothing items from bay.
- Solgov armor vests, as well as a 'tactical vest' (None avail. in game)
- Alternate atmos, engineering, mining, medical, and security suits. (Due to their stats, only available through cargo).
- Three new hazard vest colors, blue, green, white. (Load out option)
- 'Service jackets' Black and Green (Load out option).
- Solgov fleet dress uniforms, surgical apron, marshal jacket (None avail. in game, may change with the surgical apron in the future.)
- As a side change the Construction, HAZMAT, Biohazard, and EMT voidsuits are also now available from cargo. HAZMAT and Biohzard come with slightly adjusted stats to sort of reflect what they are designed for.
2016-11-24 19:19:26 -08:00
redstryker
469082aa59 Head Item Additions and Changes 2016-11-21 17:00:23 -05:00
Anewbe
a67e57e727 Simple fix is good fix 2016-11-18 22:32:45 -06:00
Anewbe
4a7f88555a Adds flashlights to loadout 2016-11-14 17:55:53 -06:00
Anewbe
f9012b6100 Fixes loincloth sprite, removes them from xenogear (they're in shorts selection) 2016-11-10 17:35:44 -06:00
Arokha Sieyes
d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
2016-11-04 15:42:32 -04:00
Anewbe
59d410348a Fixes Aviators blocking flash incorrectly, adds in stylish aviators 2016-10-26 21:06:51 -05:00
Yoshax
11209a5b0e Tweaks path from sechud/toggle to sechud/aviator 2016-10-25 20:40:26 +01:00
Yoshax
5a232b8837 Ports Baystation12/Baystation12#14433 2016-10-25 18:54:16 +01:00
Arokha Sieyes
92833e335c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.

# Conflicts:
#	code/datums/uplink/ammunition.dm
#	code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
#	code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
#	code/game/gamemodes/technomancer/spells/projectile/overload.dm
#	code/game/gamemodes/technomancer/spells/projectile/projectile.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/science.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/flashlight.dm
#	code/game/objects/items/weapons/power_cells.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/client/preference_setup/loadout/loadout_shoes.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/clothing/spacesuits/void/station.dm
#	code/modules/integrated_electronics/assemblies.dm
#	code/modules/integrated_electronics/input_output.dm
#	code/modules/integrated_electronics/tools.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/organs/blood.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/dnalocking.dm
#	code/modules/projectiles/effects.dm
#	code/modules/projectiles/guns/energy.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/research/designs.dm
#	html/changelogs/.all_changelog.yml
#	html/changelogs/Anewbe - Beret.yml
#	html/changelogs/Anewbe - Tape Roll.yml
#	html/changelogs/MagmaRam-PR-2631.yml
#	html/changelogs/Redstryker - EMTVoidsuits.yml
#	icons/mob/head.dmi
#	icons/mob/items/lefthand_hats.dmi
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_hats.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/skrell/helmet.dmi
#	icons/mob/species/skrell/suit.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/mob/species/tajaran/suit.dmi
#	icons/mob/species/unathi/helmet.dmi
#	icons/mob/species/unathi/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/species/seromi/hats.dmi
#	icons/obj/clothing/species/seromi/suits.dmi
#	icons/obj/clothing/species/skrell/hats.dmi
#	icons/obj/clothing/species/skrell/suits.dmi
#	icons/obj/clothing/species/tajaran/hats.dmi
#	icons/obj/clothing/species/tajaran/suits.dmi
#	icons/obj/clothing/species/unathi/hats.dmi
#	icons/obj/clothing/species/unathi/suits.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/power.dmi
#	maps/RandomZLevels/stationCollision.dm
#	maps/polaris-1.dmm
#	maps/polaris-2.dmm
2016-10-20 21:24:07 -04:00
Anewbe
510cf17723 Waistcoats are accessories 2016-10-19 22:29:22 -05:00
Arokha Sieyes
3acc33c3a5 Fed and KHI Uniforms/Suits
Adds Joan's Fed overcoats and my KHI uniforms as optional alternate uniforms for departments. Each requires you to be in that department to let you spawn with it.

(The Kitsuhana.dmi change is a change to my own synth sprite to fix a sprite error, unrelated)
(Also updates the sprite in custom_clothes_vr.dmi for an item for Tempest for her medhud)
2016-10-19 15:20:35 -04:00
Arokha Sieyes
00405946a4 Adds KH life crystal fluff/loadout item
It just exists as a fluff excuse as to how you get cloned offsite if you don't get cloned at CC, if you want an alternative. The little lore behind it is that it notifies an offsite agency if you die so you can get cloned by them. It has a little paper in the carrying case explaining that.

It's a uniform accessory, or you can just pocket it. They are unmarked, so finding a broken one shouldn't be very interesting evidence or influence much outside just the fluff idea of their existence.

(Also, it's a crystal, but no it's not magic. The manual goes into detail about the power source, transmitter, etc.)
2016-10-14 01:52:28 -04:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Spades
2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
redstryker
d6f7d0a007 Medic Band 2016-10-04 07:56:14 -04:00