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
Anewbe
c68fb0861f
Ports the background icons for char setup
2017-10-27 23:00:34 -05: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
Neerti
ca84cd326a
Merge pull request #4139 from Anewbe/nicknames
...
Adds the ability to choose nicknames
2017-10-23 13:37:34 -04:00
Anewbe
28c9c12837
Adds the ability to choose nicknames
2017-10-22 00:56:46 -05:00
Cameron653
d1e939a50d
Adds holo collar to loadout
2017-10-20 16:24:29 -04:00
Anewbe
79eb840538
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vatborn
2017-10-19 09:57:26 -05: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
d886e52ac3
Merge pull request #4080 from shazbot194/Synth_color
...
Synth Coloring
2017-10-16 17:55:24 -05:00
Neerti
9ae54fb2ac
Merge pull request #4083 from Anewbe/trait_fix
...
Trait tweaks
2017-10-16 18:51:01 -04:00
Anewbe
03aa2d691d
Trait tweaks
2017-10-16 01:07:56 -05:00
Anewbe
f42457b997
Starts work on the Vatborn Human species
2017-10-15 23:26:22 -05:00
shazbot194
d199d4caf7
Adds in the option to color all synth parts and two sets of parts
...
As the titles says
2017-10-15 14:56:14 -08: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
61aaf8ffee
Loadouts should be fixed.
2017-10-13 10:54:13 -05:00
Neerti
a8513844ec
Adds a Trait system ( #4048 )
...
* Works on trait system, wip.
* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
Anewbe
dea7346b94
Fixes the autologging items in antag records
2017-10-11 21:16:18 -05:00
Cyantime
b38819afe2
Fixes a typo in alternate job title selection.
2017-10-10 14:19:21 -04: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
7266310755
Merge pull request #4025 from Anewbe/prosthetic_organs
...
Prosthetic Organs Tweaks
2017-10-06 01:18:16 -04:00
Anewbe
9d5dd1cc48
Allows use of more internal prosthetic organs
2017-10-05 20:42:03 -05: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
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
