Commit Graph

1133 Commits

Author SHA1 Message Date
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
ff1103c7d9 Removes the military clothing from the loadout, repaths things 2017-12-07 21:21:05 -06:00
mistyLuminescence
532cc711fa PsychHUD! 2017-12-04 00:05:10 +00:00
Belsima
0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Kelshark
8b3ed611ff Merge branch 'master' of https://github.com/VOREStation/VOREStation 2017-11-27 23:22:50 -05:00
Belsima
2d3a306dea Loadout additions + fixes. (#4339)
* Loadout additions + fixes.

* Selection fix.
2017-11-27 19:21:49 -06:00
Kelshark
33d109b2dd Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
2017-11-25 11:35:10 -05:00
Verkister
dcdeba60ae adds gn set 2017-11-22 23:53:59 +02:00
Verkister
d699b23e9f Adds yet another new loadout accessory.
-Drop straps. Basically dropped suspenders or drop pouches without the pouches.
-Basically I've been really digging the aesthetic thiccness of the drop pouches and just wanted the look available without the access walls and color restrictions.
-Yeah it's colorable too.
2017-11-22 22:56:38 +02:00
mistyLuminescence
b1bfea36dc Friendships are no longer priceless 2017-11-18 17:55:35 +00:00
mistyLuminescence
0d9a175aac Adds bracelets! 2017-11-17 18:27:35 +00:00
Verkister
7c7794f74f Unrestricts my fluff goggles for general loadout use.
-Opie's orange goggles and Cameron's aesthetic science goggles.
-The orange goggles can also be worn on ear slot in order to have their up state above the hair layer.
2017-11-16 09:31:27 +02:00
Verkister
8c1fb156be Adds a cosmetic "armor vest" taur saddlebag subtype.
-Works with 4-legged taurs as the other taurbags.
-Has normal backpack stats whereas the other saddlebags have duffle stats.
2017-11-14 16:18:47 +02:00
Cameron653
8714c006ff Update loadout_accessories.dm 2017-11-10 18:33:44 -05:00
Cameron653
d5e9f96493 Makes wallets (except for orange) free of cost 2017-11-10 18:29:44 -05:00
Cameron653
df89195c48 Makes tracking implant cost 0
For preds
2017-11-10 18:28:30 -05:00
Kelshark
8b32b39c6f Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
2017-11-07 08:17:53 -05:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Belsima
28ab1e51f3 Removes some loadout items that have colorable versions. (#4173)
* Removes the 5000 flats options.

* Removes the 5000 hair flower pin options.
2017-11-01 22:19:20 -05:00
Anewbe
6611cb271b Merge pull request #4190 from mistyLuminescence/plushierework2561
Plushie tweaks!
2017-11-01 21:57:56 -05:00
mistyLuminescence
f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
Kelshark
92980edc93 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
2017-10-29 18:14:56 -04:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe
09ff4c1a3a Cleans up MedAviator code, adds normal aviators to the Command/Sec loadout 2017-10-23 16:30:09 -05:00
Cameron653
d1e939a50d Adds holo collar to loadout 2017-10-20 16:24:29 -04:00
mistyLuminescence
e76447a719 Loadout stuff, but done right! (#4094)
* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE
2017-10-19 09:36:15 -05:00
Kelshark
3ab70b7996 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme
2017-10-17 08:49:37 -04:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Neerti
5af9c1971d Merge pull request #4077 from Anewbe/rings
Rings
2017-10-16 19:04:36 -04:00
Anewbe
3c2831e5d9 Adds rings 2017-10-15 15:05:52 -05:00
Kholdstare34
becc2e4290 Adds heads of staff cloaks, adds them to the loadout. 2017-10-15 15:02:25 -05:00
Anewbe
dea7346b94 Fixes the autologging items in antag records 2017-10-11 21:16:18 -05:00
killer653
fa1170c7e8 Should fix all the corp regs & codex issues 2017-10-09 23:42:08 -04:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Neerti
4b1eb3a19a Merge pull request #4017 from Anewbe/lawbook
Adds Neerti's Law Book
2017-10-05 12:56:23 -04:00
Anewbe
0de6cddef5 Activates Neerti's Lawbook 2017-10-03 22:29:50 -05:00
Anewbe
860c1d2e9f Makes the auto-antag-record logging for loadout items prettier 2017-10-02 03:08:01 -05:00
Anewbe
7c5d7c4d75 Improves tracking implant code, adds a tracking implant variant to the loadout 2017-09-28 20:25:46 -05:00
Kelshark
bd95659677 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-09-21 18:37:29 -04:00
Dwaggy
f83a9a79ba Added the expeditionary jumpsuits to loadout list under suits and uniforms within new YW file to avoid wonderful clashes where possible.
the selection comes up as "Expeditionary jumpsuit Selection", and gives drop down selection choice.
2017-09-21 14:21:55 +01:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Belsima
fb0e4d3cf9 General uniform updates. (#3814)
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
killer653
47afd1502d Adds a loincloth to the xeno loadout 2017-09-11 21:18:29 -04:00
Verkister
3bd672954d Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items)
-Adds the approved fluff goggles https://forum.vore-station.net/viewtopic.php?f=26&t=1073
-Also adds general use metal necklace thingy and a colorable headband for loadout selection.
2017-09-06 15:55:16 +03:00
killer653
e2ea7951d3 Teshari stuff was added to Polaris. 2017-08-28 21:22:05 -04:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Anewbe
3650fb1562 Merge pull request #3699 from Belsima/master
A load of Teshari stuff: For Real This Time
2017-08-16 22:53:00 -04:00
Belsima
cb7b9ca64e please don't get mad at me github 2017-08-10 16:12:29 -04:00