Commit Graph

1084 Commits

Author SHA1 Message Date
Kelshark
9e4136784d Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/species/akula/mask_vr.dmi
#	icons/mob/species/fennec/mask_vr.dmi
#	icons/mob/species/fox/mask_vr.dmi
#	icons/mob/species/nevrean/mask_vr.dmi
#	icons/mob/species/vulpkanin/mask.dmi
#	icons/mob/vore/taurs_vr.dmi
2017-10-03 19:04:51 -04:00
killer653
58a85b059f Allows the ability to Ckey lock hair 2017-10-03 18:04:31 -04:00
Anewbe
860c1d2e9f Makes the auto-antag-record logging for loadout items prettier 2017-10-02 03:08:01 -05:00
Cameron653
b83a7c4370 Makes neutral traits not take trait slots 2017-09-30 13:35:25 -04: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
Spades
e0db8feb50 Merge pull request #1996 from Cameron653/SPIDER_RACE
Spider race & modifications!
2017-08-14 00:31:39 -04:00
Verkister
22e6bcb520 Enables dual coloring for ears.
-Ya know how a bunch of the ear options have that untouchable bright white inner part?
-You can touch it now :D
-Also renames the ear color vars for better compatibility and consistency.(red/g/b_ear > r/g/b_ears etc)
2017-08-13 15:20:11 +03:00
killer653
dc828eaab0 Spiders! 2017-08-12 23:02:38 -04:00
Spades
c8f16aa2b6 Merge pull request #1972 from VOREStation/solgov-lore-fixes
Return of the UNSC
2017-08-10 19:55:33 -04:00
Belsima
cb7b9ca64e please don't get mad at me github 2017-08-10 16:12:29 -04:00
Belsima
d4e3b4453d A load of Teshari stuff: For Real This time 2017-08-10 16:12:16 -04:00
Spades
fe7ba8036d Return of the UNSC
- Overwrote SolGov lore.
- Removed mentions of SifGuard.
- Confederate is now just Central because Confederacy is a stupid type
of government for something with decent cohesion on the galactic stage.
- Stuff I'm not done with
- I'm fucking tired
- Zzzzzzzzzzzzzzzz
2017-08-10 14:22:26 -04:00
killer653
a2f346df0f Makes wings their own seperate entity on char setup 2017-08-10 07:12:22 -04:00
PrismaticGynoid
1f1f537e1c Better Wheelchairs
Wheelchairs can now be collapsed by click-dragging them to you, much like rollerbeds. You can then pick them up. They are, however, too large to stuff into a backpack.
These new collapsible wheelchairs are now available in the loadout, under utility, for 4 points. They're also color-customizable now. No more plain white wheelchairs available only by missing feet.
The loadout wheelchairs will spawn with you buckled into them, just like how it works when you spawn without feet, except that the loadout wheelchairs can be more colors than just white.
2017-08-09 00:48:13 -07:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Cameron653
23d553185e Adds tab 2017-08-04 19:27:12 -04:00
killer653
9a6a454a64 Unused 2017-07-28 06:45:33 -04:00
killer653
4fcbbe40f1 Size changes. 2017-07-28 06:43:44 -04:00
Neerti
139d397a47 Merge pull request #3578 from Anewbe/surgical_caps
Adds surgical caps to the loadout
2017-07-23 17:42:51 -04:00
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
Verkister
b936f72d9a Merge branch 'master' of https://github.com/VOREStation/VOREStation into blehh
# Conflicts:
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	icons/mob/vore/tails_vr.dmi
2017-07-18 11:05:33 +03: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
Verkister
84b994b2d7 Slight charstomization overhauls.
-Lined up and un-overlapped the setup previews. Also taurs can now fit into the frame and not be cropped in half.
-Unlocked the hidden and forgotten feature for secondary tail/taur colors.
-Currently the only enabled things are the colorable wolf tail and a new dual color wolftaur. The framework for more is ready for use though!
-Liberated ear coloring from the oppression of hair color.
-Disabled drake and otie taurs since they lack all gear compatibility :v
2017-07-13 00:20:02 +03: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
Arokha Sieyes
b1aeba9281 Persistent size between rounds
Allows your size to save at the end of each round. Get shrank'd or enbiggened? Now you can stay tiny between rounds if you like that consistency.

Don't want that? Just turn it off on the VORE tab. Accidentally left it on, and got saved? Just change your size to what you want in the character setup (and turn off saving it, too).
2017-06-16 09:41:34 -04:00