Leshana
197a648795
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Anewbe
1633c32c99
Merge pull request #3478 from Bromuzl/Bromuzl-High-topsLoadout
...
High-tops loadout
2017-05-29 13:11:57 -05:00
Bromuzl
48f668de95
Adds ported high-tops to loadout
...
Extends the high-top port to load-outs,
2017-05-27 04:38:15 -05:00
Leshana
5f5ea3ea3b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
...
# Conflicts:
# 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/machinery/computer/Operating.dm
# code/game/machinery/computer/camera.dm
# code/game/machinery/computer/communications.dm
# code/game/machinery/computer/security.dm
# code/game/machinery/computer/skills.dm
# code/game/objects/items/devices/radio/jammer.dm
# html/changelogs/.all_changelog.yml
# maps/~map_system/maps.dm
# nano/images/nanomap_z1.png
# nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Schnayy
b1cb74b318
Adds 4 new clothing sprites & puts them in the loadout.
...
Peacoats: Requested.
Black corset/skirt combo: Requested.
Flower dress: First ss13 sprite I made, threw it in.
Red swept dress: A new, nicer red dress.
2017-05-22 18:08:01 -05:00
Leshana
4fbfa7ee37
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
...
# Conflicts:
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/mob_defines.dm
# html/changelogs/.all_changelog.yml
# vorestation.dme
2017-05-08 21:07:45 -04:00
Cerebulon
0ce6ca7290
Cleans up uniform loadout menu.
...
Suits are now mostly under one-piece (subtypes of 'lawyer') and modular (subtypes of 'suit_jacket') selection menus. Croptops also under selection menu.
2017-05-08 00:31:31 +01:00
Anewbe
3b82b75f83
Merge pull request #3396 from Cerebulon/skirtsuits
...
Adds 24 new skirt versions of suit sprites.
2017-05-05 21:55:14 -05:00
Cerebulon
36decd20b7
Adds icons. Adds skirts to loadout options and closets.
2017-04-30 02:39:27 +01:00
Cerebulon
339b269393
Adds 23 new skirt versions of existing suit sprites.
...
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
2017-04-29 12:01:40 +01:00
Anewbe
b7751bab10
Changelog, adds the dicecup to the loadout
2017-04-17 12:44:34 -05:00
Arokha Sieyes
dc22050140
Loadout path fix
2017-04-10 20:55:24 -04:00
Arokha Sieyes
e7d8af7ae7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/client/preference_setup/loadout/loadout_xeno.dm
# code/modules/mob/mob.dm
# html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
Anewbe
4a33a8df82
Merge pull request #3216 from Neerti/3/22/2017_the_empress_protects
...
Implements the new Codex.
2017-04-08 13:02:43 -05:00
Neerti
a4a05ae4ec
Implements the new Codex.
2017-04-08 12:08:08 -04:00
Anewbe
e9c4b5a3eb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# icons/mob/back.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Arokha Sieyes
85a489b9b6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-04-04 20:25:00 -04:00
Poojawa
b52857e175
Update loadout_uniform_vr.dm
...
misplaced comma
2017-04-03 23:04:31 -05:00
Poojawa
e44e1c6c44
sergal hardsuits
2017-04-03 22:59:40 -05:00
Anewbe
8e9db2b7d4
Aprons now have pockets
2017-04-02 00:28:20 -05:00
Leshana
6eee55c983
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# code/modules/client/preference_setup/general/03_body.dm
# code/modules/mob/new_player/sprite_accessories.dm
# html/changelogs/.all_changelog.yml
# icons/mob/human_races/markings.dmi
# vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
7bb3f5fbb7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# code/datums/supplypacks/medical.dm
# code/game/objects/structures/crates_lockers/closets/wardrobe.dm
# code/modules/clothing/shoes/miscellaneous.dm
# code/modules/clothing/suits/labcoat.dm
# icons/mob/back.dmi
# icons/mob/feet.dmi
# icons/mob/human_face.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/shoes.dmi
# icons/obj/clothing/suits.dmi
# icons/obj/storage.dmi
# maps/northern_star/polaris-2.dmm
# maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Anewbe
ca47d37d2f
Adds a few more cosmetic flashlights
2017-03-31 18:50:00 -05:00
Anewbe
2867f17b51
Merge pull request #3162 from Schnayy/department_jackets
...
Adds Department Color Jackets
2017-03-30 20:11:39 -05:00
Anewbe
0924e4e7a2
Merge pull request #3135 from Belsima/skrell
...
Skrell sprite updates.
2017-03-28 18:28:58 -05:00
Arokha Sieyes
1ba87bea73
Merge polaris sync
2017-03-28 12:24:46 -04:00
Schnayy
5cf0d35d1d
Adds Department Color Jackets
...
Moves/renames red&black jacket to sec_dep_jacket, adds supply, engineering, medical, and science jackets. Puts them all in the loadout.
Have one issue: when the jacket is open there are no handsprites. How do I fix that without duplicating sprites?
2017-03-28 03:39:10 -05:00
Yoshax
ba7cad162d
Revert "Makes space in the uniforms.dmi file"
...
This reverts commit 6b0500dd27
2017-03-27 03:34:12 +01:00
Arokha Sieyes
60d541037c
Fix compile error from merge
2017-03-26 20:32:33 -04:00
Arokha Sieyes
9edf3a6629
Polaris Merge Sync
2017-03-26 20:12:34 -04:00
Anewbe
d665a0dee2
Makes translators more expensive
2017-03-26 17:36:36 -05:00
Anewbe
6b0500dd27
Makes space in the uniforms.dmi file
2017-03-26 00:59:14 -05:00
Schnayy
ade40d627e
Added 3 clothing sprites w/ appropriate ground/held sprites. ( #3134 )
...
* Added 3 clothing sprites w/ appropriate ground/held sprites.
1, white yoga pants, intended to be any color.
2, white kimono, intended to be any color.
3, red and black jacket.
All intended to be in the loadout.
* Put coding in. Jacket has pockets, same cold resistance as a hoodie. Kimono and yoga pants have color selectors. All are in the loadout.
* Removed cold protection from jacket & fixed missing mob sprites. Don't know what happened with the latter, was definitely there when I tested it.
2017-03-25 17:44:04 -05:00
Schnayy
8bb5924481
Adds greyscale sprites for heels worn/held/on the ground. ( #3133 )
...
* Adds greyscale sprites for heels worn/held/on the ground. Still needs coding. First commit, hope I do it right!
* Fixed capitalization, added coding.
* Rennamed heelsheld to heels, as per anewbe's request.
2017-03-25 16:48:39 -05:00
nachomeep
fda29e2bc0
big sprite update for skrell
2017-03-25 10:08:03 -04:00
Arokha Sieyes
805b473976
Polaris Sync Merge
...
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Anewbe
ab1812d9ff
Adds the ear translator
2017-03-13 20:03:45 -05:00
Anewbe
f4dd443b01
Ports the translator
2017-03-10 21:46:57 -06:00
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
