cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-25 22:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Voreupdate

Browse Source
This commit is contained in:
izac112
2021-07-20 09:52:23 +02:00
parent 38ccfae3e0 3e92158c96
commit a4553391ec
84 changed files with 21830 additions and 20632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+2 -2
View File
@@ -117,6 +117,6 @@
Talon pin
*/
/datum/gear/accessory/talonpin
display_name = "ITV pin"
description = "A small enamel pin of the ITV logo."
display_name = "Talon pin"
description = "A small enamel pin of the Talon logo."
path = /obj/item/clothing/accessory/talon
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+2 -2
View File
@@ -53,10 +53,10 @@
Talon hats
*/
/datum/gear/head/cap/talon
display_name = "cap, ITV"
display_name = "cap, Talon"
path = /obj/item/clothing/head/soft/talon
/datum/gear/head/beret/talon
display_name = "beret, ITV"
display_name = "beret, Talon"
path = /obj/item/clothing/head/beret
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+1 -1
View File
@@ -82,5 +82,5 @@
Talon winter coat
*/
/datum/gear/suit/wintercoat/talon
display_name = "winter coat, ITV"
display_name = "winter coat, Talon"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+2 -2
View File
@@ -221,8 +221,8 @@ Bluespace jumpsuit
Talon jumpsuit
*/
/datum/gear/uniform/talonbasic
display_name = "ITV Jumpsuit"
description = "A jumpsuit that is usually issued to ITV contractors, however others can purchase it to show their support towards ITV."
display_name = "Talon Jumpsuit"
description = "A jumpsuit that is usually issued to ITV Talon contractors, however others can purchase it to show their support towards the ship."
path = /obj/item/clothing/under/rank/talon/basic
// Summer dresses
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+1 -1
View File
@@ -62,7 +62,7 @@
allowed_roles = list("Pathfinder","Explorer")
/datum/gear/utility/dufflebag/talon
display_name = "ITV dufflebag"
display_name = "Talon dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/explorer
/datum/gear/utility/ID
code/modules/client/preference_setup/vore/07_traits.dm
+17 -4
View File
@@ -79,20 +79,33 @@
pref.pos_traits.Cut()
pref.neg_traits.Cut()
// Clean up positive traits
for(var/path in pref.pos_traits)
for(var/datum/trait/path as anything in pref.pos_traits)
if(!(path in positive_traits))
pref.pos_traits -= path
continue
var/take_flags = initial(path.can_take)
if((pref.dirty_synth && !(take_flags & SYNTHETICS)) || (pref.gross_meatbag && !(take_flags & ORGANICS)))
pref.pos_traits -= path
//Neutral traits
for(var/path in pref.neu_traits)
for(var/datum/trait/path as anything in pref.neu_traits)
if(!(path in neutral_traits))
pref.neu_traits -= path
continue
if(!(pref.species == SPECIES_CUSTOM) && !(path in everyone_traits))
pref.neu_traits -= path
continue
var/take_flags = initial(path.can_take)
if((pref.dirty_synth && !(take_flags & SYNTHETICS)) || (pref.gross_meatbag && !(take_flags & ORGANICS)))
pref.neu_traits -= path
//Negative traits
for(var/path in pref.neg_traits)
for(var/datum/trait/path as anything in pref.neg_traits)
if(!(path in negative_traits))
pref.neg_traits -= path
continue
var/take_flags = initial(path.can_take)
if((pref.dirty_synth && !(take_flags & SYNTHETICS)) || (pref.gross_meatbag && !(take_flags & ORGANICS)))
pref.neg_traits -= path
var/datum/species/selected_species = GLOB.all_species[pref.species]
if(selected_species.selects_bodytype)
// Allowed!