cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-17 04:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,630 Commits 8 Branches 0 Tags
e9abd9894de9122d4b16b3ea8c70a96370138d84
Commit Graph

308 Commits

Author SHA1 Message Date
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
izac112
c85bf8104c Voreupdate (Small) 2020-08-05 17:45:22 +02:00
lbnesquik
fbacbad91d Tweaks to taur clothes, particularly saddles as well as tail tags. 
- Remove capitalisation from back_vr.dmi
- Add a tag to most tails. This can be used for many things, but mostly to have an simpler check of the tail type. See backpack_vr.dm.
- Switch the backpack sprite selection to a switch()
 2020-08-02 22:22:27 +02:00
Shadowfire
6df72f3a23 Genetics and goia parts 
Not that they have to do with each other!

Changes:
Made genetics lab in the dedicated room for it
gotten rid of cloning room, it wasnt needed anymore
shifted morgue to cloning area
made a comfy corner in medical patient wing to space
moved equipment storage into small room to use the space
shifted bathroom a little
Geneticist is now select able again

Goia parts! Theres a tail, ears, and two taur bodies, one slim, one chonk
 2020-07-26 15:24:02 +02:00
Repede
9f7862f551 Fixes web bindings to use tesh sprites weee 2020-07-22 19:03:04 -04:00
SplinterGP
97d215d558 correct tail for alt pattern tail 2020-07-15 16:13:24 -03:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
SplinterGP
d01a0d207a Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-07-06 17:25:42 -03:00
SplinterGP
a056658ef6 Tesh fluffies 2020-07-06 16:58:15 -03:00
lukevale
4c9cd195e4 Adds in cyber dragon wings. 2020-07-05 02:40:55 -05:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
KasparoVy
44dbef245c Add a Couple Nevrean Tails, Remove Duplicate 
Adds a couple dual-colour Nevrean tails.

Also WTF is up with the extremely colourful monkey tail
 2020-06-19 02:54:55 -04:00
Repede
d0d7685e4f Removes all restrictions on tail / ears / etc selection, no ckey locks or species lock. 
People should be able to play whatever they want.
 2020-06-13 17:55:36 -04:00
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
Natje0
982850cb71 Tentacles 2020-06-06 12:42:03 +02:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Heroman
5fd9552e8a Adds mermaid tails taur option 2020-06-02 06:42:38 +10:00
Natje0
c882cd57ca add tentacle 2020-05-31 01:43:17 +02:00
izac112
be538243c1 various fixes 2020-05-27 22:43:33 +02:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
48563200ce VS: Tweak some icon blending 2020-05-18 13:42:42 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
KasparoVy
67ce8f383c Adds Equine Facial Markings & Ears 
I was poring over the markings list as usual, inspired this time to draft a donkey but was woefully struck by a lack of equine markings. Neigh, this cannot be! So I took to resolving the issue post-haste.

The muzzle is flexible goes quite well with draconic designs too. Recommended to use with the Sergal bodytype for best results.
 2020-05-16 02:35:06 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Nepox
942054ad66 I dont want to do this anymore 
Please
 2020-05-07 23:27:48 +02:00
Nepox
3755762277 Fixes Rosey's pentatail 
Attempt 2: Electric Bogaloo. This time hopefully without undoing newer changes. 

Tail is now colorable. I hope.
 2020-05-07 22:40:58 +02:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
izac112
46973f969a Fixes 
Some fixes here and there to make the new vore updates not want to murder us
 2020-05-06 22:39:38 +02:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Aronai Sieyes
d81cc57ebf Merge pull request #7602 from KasparoVy/the-marked-one 
Adds 2 New Ears, a Tail & a Few Markings
 2020-05-03 13:05:22 -04:00
KasparoVy
eba6e230d1 Adds 2 New Ears, a Tail & a Few Markings 
Adds short/terrier & thin/jackal Vulpkanin ears (dual-colourable)
Adds a dual-colourable tail inspired by Ward-Takahaski cybernetics.
Adds a few markings:
--> Vulp Short Nose (shifted 1 pixel closer to the face in the east/west sprites)
--> Vulp Alt. Face (Vulpine facial hair but in marking form)
--> Taj Alt. Nose (Tajaran nose marking but colour mult & the same colour in all dirs)
--> Talons (Inspired by Ward-Takahashi Spirit markings)
--> Claws (Inspired by Ward-Takahashi Spirit markings)
 2020-05-03 02:25:21 -04:00
Aronai Sieyes
8b7a7050fe VS: Smooth 2020-05-02 19:21:02 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
KasparoVy
c433d6e386 Blue/Colourable/Surgical Aprons & Old Poncho for Most Taurs 
Just getting this done - soon (TM) I'll be working on regular cloaks & ponchos.

Blue, colourable & surgeon apron
Mexican poncho

Added for cow, deer, drake, feline, horse, lizard, naga, otie, slug & wolf taurs (where missing).

Minor sprite adjustment to drake taur's Mexican poncho.
 2020-04-26 20:52:26 -04:00
Shadow Quill
9cbd2f415a Nightstalker Tail~ 2020-04-24 09:43:09 -05:00
Shadow Quill
8f5a20d29c Nightstalker Tail~ 2020-04-24 05:41:58 -05:00
Razgriz
09293a0b02 Merge branch 'master' into UpstreamMergeApril2020 2020-04-22 03:17:50 -07:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Heroman
1ddbab789a Removes species restrictions from shadekin tails 2020-04-16 14:29:00 +10:00
Shadowfire
5b2c5b295b snail shell sprite 
A snail shell that fits in wing slot, sprited by Skits
 2020-04-14 10:23:37 +02:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Runa Dacino
fd4410cc71 Adds new ear options 
Since in fiction, demons often possess pointy ears (and for my own needs), I have decided to enable our demonic degenerates to have pointy ears in addition to fancy horns!

Ram-like (caprine), backwards and forward pointing classic demon, oni and finally those large backswept dragon horns can now be picked alongside a pair of elven ears. 

Both the ears and the horns are separately colourable. Ears are first option, horns are second.
 2020-04-11 15:24:14 +02:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
kcin2001
266c7e78a6 Make Xenohybrids colorable again 2020-04-01 02:38:38 -07:00
Aronai Sieyes
301b5eb467 Allow wings with a secondary color 
Adds code to support wings with extra_overlay having a secondary color, like tails do. Currently extra_overlay is just ignored on wings.
 2020-03-31 22:40:48 -04:00
Matica
2b9c021f08 Ports YW's ears and wings 
Port's YW's big dragon horns, as well as their wings.
 2020-03-31 20:02:42 -04:00
Natje0
66d6778957 Fixed tails.dmi to tails_vr.dmi 2020-03-27 00:52:29 +01:00
Natje0
fdd85c3812 Code for kitsune tails 2020-03-27 00:23:47 +01:00
Repede
8ef48111fd Adds straight jacket and web bindings sprite for Teshari 
Sprites by Dopiotl!
 2020-03-23 19:49:38 -04:00