cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

removes plasma vessels from polysmorph for being blatant fetish content (#10243)

Browse Source 
fuck everyone involved with this race
we arent fucking citadel
This commit is contained in:
ynot01
2020-11-01 13:49:28 -05:00
committed by GitHub
parent 0ce9823833
commit 62b1580452
10 changed files with 4 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__HELPERS/global_lists.dm
View File

@@ -32,7 +32,6 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.r_wings_list,roundstart = TRUE)
init_sprite_accessory_subtypes(/datum/sprite_accessory/caps, GLOB.caps_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/plasma_vessels, GLOB.plasma_vessels_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/teeth, GLOB.teeth_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/dome, GLOB.dome_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/dorsal_tubes, GLOB.dorsal_tubes_list)

4
code/__HELPERS/mobs.dm
View File

@@ -72,8 +72,6 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.wings_list)
if(!GLOB.moth_wings_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
if(!GLOB.plasma_vessels_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/plasma_vessels, GLOB.plasma_vessels_list)
if(!GLOB.teeth_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/teeth, GLOB.teeth_list)
if(!GLOB.dome_list.len)
@@ -82,7 +80,7 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/dorsal_tubes, GLOB.dorsal_tubes_list)
//For now we will always return none for tail_human and ears.
return(list("mcolor" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),"ethcolor" = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)], "tail_lizard" = pick(GLOB.tails_list_lizard), "tail_human" = "None", "wings" = "None", "snout" = pick(GLOB.snouts_list), "horns" = pick(GLOB.horns_list), "ears" = "None", "frills" = pick(GLOB.frills_list), "spines" = pick(GLOB.spines_list), "body_markings" = pick(GLOB.body_markings_list), "legs" = "Normal Legs", "caps" = pick(GLOB.caps_list), "moth_wings" = pick(GLOB.moth_wings_list), "tail_polysmorph" = "Polys", "plasma_vessels" = pick(GLOB.plasma_vessels_list), "teeth" = pick(GLOB.teeth_list), "dome" = pick(GLOB.dome_list), "dorsal_tubes" = pick(GLOB.dorsal_tubes_list)))
return(list("mcolor" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),"ethcolor" = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)], "tail_lizard" = pick(GLOB.tails_list_lizard), "tail_human" = "None", "wings" = "None", "snout" = pick(GLOB.snouts_list), "horns" = pick(GLOB.horns_list), "ears" = "None", "frills" = pick(GLOB.frills_list), "spines" = pick(GLOB.spines_list), "body_markings" = pick(GLOB.body_markings_list), "legs" = "Normal Legs", "caps" = pick(GLOB.caps_list), "moth_wings" = pick(GLOB.moth_wings_list), "tail_polysmorph" = "Polys", "teeth" = pick(GLOB.teeth_list), "dome" = pick(GLOB.dome_list), "dorsal_tubes" = pick(GLOB.dorsal_tubes_list)))
/proc/random_hair_style(gender)
switch(gender)

1
code/_globalvars/lists/flavor_misc.dm
View File

@@ -28,7 +28,6 @@ GLOBAL_LIST_EMPTY(legs_list)
GLOBAL_LIST_EMPTY(animated_spines_list)
//Polysmorph
GLOBAL_LIST_EMPTY(tails_list_polysmorph)
GLOBAL_LIST_EMPTY(plasma_vessels_list)
GLOBAL_LIST_EMPTY(teeth_list)
GLOBAL_LIST_EMPTY(dome_list)
GLOBAL_LIST_EMPTY(dorsal_tubes_list)

1
code/modules/admin/create_mob.dm
View File

@@ -34,7 +34,6 @@
H.dna.features["spines"] = pick(GLOB.spines_list)
H.dna.features["body_markings"] = pick(GLOB.body_markings_list)
H.dna.features["moth_wings"] = pick(GLOB.moth_wings_list)
H.dna.features["plasma_vessels"] = pick(GLOB.plasma_vessels_list)
H.dna.features["teeth"] = pick(GLOB.teeth_list)
H.dna.features["dome"] = pick(GLOB.dome_list)
H.dna.features["dorsal_tubes"] = pick(GLOB.dorsal_tubes_list)

21
code/modules/client/preferences.dm
View File

@@ -65,7 +65,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/skin_tone = "caucasian1" //Skin color
var/eye_color = "000" //Eye color
var/datum/species/pref_species = new /datum/species/human() //Mutant race
var/list/features = list("mcolor" = "FFF", "ethcolor" = "9c3030", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "moth_wings" = "Plain", "tail_polysmorph" = "Polys", "plasma_vessels" = "None", "teeth" = "None", "dome" = "None", "dorsal_tubes" = "No")
var/list/features = list("mcolor" = "FFF", "ethcolor" = "9c3030", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "moth_wings" = "Plain", "tail_polysmorph" = "Polys", "teeth" = "None", "dome" = "None", "dorsal_tubes" = "No")
var/list/genders = list(MALE, FEMALE, PLURAL)
var/list/friendlyGenders = list("Male" = "male", "Female" = "female", "Other" = "plural")
@@ -437,19 +437,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "</td>"
mutant_category = 0
if("plasma_vessels" in pref_species.default_features)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
dat += "<h3>Plasma Vessels</h3>"
dat += "<a href='?_src_=prefs;preference=plasma_vessels;task=input'>[features["plasma_vessels"]]</a><BR>"
mutant_category++
if(mutant_category >= MAX_MUTANT_ROWS)
dat += "</td>"
mutant_category = 0
if("teeth" in pref_species.default_features)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
@@ -1509,12 +1496,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_moth_wings)
features["moth_wings"] = new_moth_wings
if("plasma_vessels")
var/new_plasma_vessels
new_plasma_vessels = input(user, "Choose your character's plasma vessels:", "Character Preference") as null|anything in GLOB.plasma_vessels_list
if(new_plasma_vessels)
features["plasma_vessels"] = new_plasma_vessels
if("teeth")
var/new_teeth
new_teeth = input(user, "Choose your character's teeth:", "Character Preference") as null|anything in GLOB.teeth_list

3
code/modules/client/preferences_savefile.dm
View File

@@ -383,7 +383,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["feature_lizard_legs"] >> features["legs"]
S["feature_moth_wings"] >> features["moth_wings"]
S["feature_polysmorph_tail"] >> features["tail_polysmorph"]
S["feature_polysmorph_plasma_vessels"] >> features["plasma_vessels"]
S["feature_polysmorph_teeth"] >> features["teeth"]
S["feature_polysmorph_dome"] >> features["dome"]
S["feature_polysmorph_dorsal_tubes"] >> features["dorsal_tubes"]
@@ -479,7 +478,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
features["body_markings"] = sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
features["feature_lizard_legs"] = sanitize_inlist(features["legs"], GLOB.legs_list, "Normal Legs")
features["moth_wings"] = sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list, "Plain")
features["plasma_vessels"] = sanitize_inlist(features["plasma_vessels"], GLOB.plasma_vessels_list)
features["teeth"] = sanitize_inlist(features["teeth"], GLOB.teeth_list)
features["dome"] = sanitize_inlist(features["dome"], GLOB.dome_list)
features["dorsal_tubes"] = sanitize_inlist(features["dorsal_tubes"], GLOB.dorsal_tubes_list)
@@ -535,7 +533,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["feature_lizard_body_markings"] , features["body_markings"])
WRITE_FILE(S["feature_lizard_legs"] , features["legs"])
WRITE_FILE(S["feature_moth_wings"] , features["moth_wings"])
WRITE_FILE(S["feature_polysmorph_plasma_vessels"] , features["plasma_vessels"])
WRITE_FILE(S["feature_polysmorph_teeth"] , features["teeth"])
WRITE_FILE(S["feature_polysmorph_dome"] , features["dome"])
WRITE_FILE(S["feature_polysmorph_dorsal_tubes"] , features["dorsal_tubes"])

16
code/modules/mob/dead/new_player/sprite_accessories.dm
View File

@@ -1932,22 +1932,6 @@
icon_state = "polys"
color_src = null
/datum/sprite_accessory/plasma_vessels
icon = 'icons/mob/mutant_bodyparts.dmi'
color_src = null
/datum/sprite_accessory/plasma_vessels/none
name = "None"
icon_state = "none"
/datum/sprite_accessory/plasma_vessels/small
name = "Small"
icon_state = "small"
/datum/sprite_accessory/plasma_vessels/medium
name = "Medium"
icon_state = "medium"
/datum/sprite_accessory/teeth
icon = 'icons/mob/mutant_bodyparts.dmi'
color_src = null

2
code/modules/mob/living/carbon/human/species.dm
View File

@@ -766,8 +766,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
S = GLOB.moth_wings_list[H.dna.features["moth_wings"]]
if("caps")
S = GLOB.caps_list[H.dna.features["caps"]]
if("plasma_vessels")
S = GLOB.plasma_vessels_list[H.dna.features["plasma_vessels"]]
if("teeth")
S = GLOB.teeth_list[H.dna.features["teeth"]]
if("dome")

4
code/modules/mob/living/carbon/human/species_types/polysmorphs.dm
View File

@@ -22,8 +22,8 @@
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
fixed_mut_color = "444466" //don't mess with this if you don't feel like manually adjusting the mutant bodypart sprites
mutant_bodyparts = list("tail_polysmorph", "plasma_vessels", "dome", "dorsal_tubes", "teeth", "legs")
default_features = list("tail_polysmorph" = "Polys", "plasma_vessels" = "None", "dome" = "None", "dorsal_tubes" = "No", "teeth" = "None", "legs" = "Normal Legs")
mutant_bodyparts = list("tail_polysmorph", "dome", "dorsal_tubes", "teeth", "legs")
default_features = list("tail_polysmorph" = "Polys", "dome" = "None", "dorsal_tubes" = "No", "teeth" = "None", "legs" = "Normal Legs")
mutanttongue = /obj/item/organ/tongue/polysmorph
mutanttail = /obj/item/organ/tail/polysmorph
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT

BIN
icons/mob/mutant_bodyparts.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 38 KiB