Anewbe
d7875f5377
Merge pull request #3609 from Belsima/legwarmers
...
Adds a load of zippos to the loadout.
2017-07-18 16:27:09 -05:00
Anewbe
b22a9fa575
Merge pull request #3589 from Belsima/gloves
...
Adds fingerless gloves.
2017-07-17 15:42:28 -05:00
Belsima
a291ae9889
Adds a load of zippos to the loadout.
2017-07-17 14:57:14 -04:00
Cameron653
b7608f81e8
Fixes code up.
2017-07-13 17:12:46 -04:00
killer653
c736b6f824
Everything works except for the loadout spawn
...
Work on later.
2017-07-13 10:15:26 -04:00
Anewbe
4e93ac107f
Merge pull request #3584 from Belsima/pens
...
Adds a fountain pen.
2017-07-11 11:24:27 -05:00
Belsima
e51de25dea
Adds fingerless gloves.
2017-07-11 00:49:02 -04:00
Belsima
1d7cea9864
renames a mislabelled pen
2017-07-10 18:07:07 -04:00
Belsima
b7a34a3645
Adds a gilded pen.
2017-07-10 18:01:43 -04:00
Belsima
c0d22058b4
Adds a boatload of sweaters.
2017-07-10 17:49:22 -04:00
kcin2001
5b912bc601
Update loadout_xeno_vr.dm
2017-07-09 22:01:44 -07:00
kcin2001
62ea1866f9
new tesh items - loadout edition
2017-07-09 21:59:47 -07:00
Anewbe
c64f7c9fa3
Merge pull request #3505 from Dhaeleena/Somecat
...
Winter boots
2017-07-09 17:13:27 -05:00
Anewbe
07c82963c9
Adds surgical caps to the loadout
2017-07-09 16:18:52 -05:00
Verkister
7333ea008f
Taur and borgo feature shieet!
...
-Added a counter for janihound to keep track of how much crap it's ate.
-Lowered janigut capacity to 25 items.
-Made mice edible for the borgo.
-Gave a gentle touch to the wolftaur sprites. (more types later?)
-Added a saddlebag version that fits itself for every quadtaur.
-Added a robust combat aesthetic saddlebag as a childtype to the forementioned.
2017-07-03 21:05:17 +03:00
Leshana
18b1828631
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630
2017-06-30 22:31:43 -04:00
Yoshax
020c1d7d88
Adds material scanner and prescription ones to loadout
2017-06-30 23:56:44 +01:00
Anewbe
81e7d9ce42
Merge pull request #3513 from Belsima/snowsuit
...
Adds snowsuits.
2017-06-25 16:27:43 -05:00
Belsima
a62c91ebd3
Appeases the mergelords.
2017-06-16 20:27:08 -04:00
Belsima
11ceb9e92f
Adds snowsuits.
...
Also fixes department jacket access.
2017-06-08 10:02:30 -04:00
Dhaeleena
7f773b0099
Adds Winter boots for every department! Adds said boots to the loadout. Adds boots to all the closets and wardroves that had winter jackets. Adds boots and jackets to some closets that had neither and fitted in.
2017-06-05 16:46:54 -03:00
MatchaFrappe
68310de0ae
Update loadout_uniform.dm
2017-06-05 17:06:32 +10:00
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
