cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes vore eggtype to not mess with mob eggtype

Browse Source
This commit is contained in:
Sebbe9123
2019-02-25 12:03:07 +01:00
committed by GitHub
parent f982ffa53c
commit 22c9bd416e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/client/preference_setup/vore/03_egg.dm
View File

@@ -12,7 +12,7 @@ var/XENOMORPH_EGG = "Xenomorph"
// Define a place to save appearance in character setup // Define a place to save appearance in character setup
/datum/preferences /datum/preferences
var/egg_type = "Egg" //The egg type they have. var/vore_egg_type = "Egg" //The egg type they have.
// Definition of the stuff for the egg type. // Definition of the stuff for the egg type.
/datum/category_item/player_setup_item/vore/egg /datum/category_item/player_setup_item/vore/egg
@@ -20,31 +20,31 @@ var/XENOMORPH_EGG = "Xenomorph"
sort_order = 3 sort_order = 3
/datum/category_item/player_setup_item/vore/egg/load_character(var/savefile/S) /datum/category_item/player_setup_item/vore/egg/load_character(var/savefile/S)
S["egg_type"] >> pref.egg_type S["vore_egg_type"] >> pref.vore_egg_type
/datum/category_item/player_setup_item/vore/egg/save_character(var/savefile/S) /datum/category_item/player_setup_item/vore/egg/save_character(var/savefile/S)
S["egg_type"] << pref.egg_type S["vore_egg_type"] << pref.vore_egg_type
/datum/category_item/player_setup_item/vore/egg/sanitize_character() /datum/category_item/player_setup_item/vore/egg/sanitize_character()
var/valid_egg_types = global_egg_types var/valid_vore_egg_types = global_vore_egg_types
pref.egg_type = sanitize_inlist(pref.egg_type, valid_egg_types, initial(pref.egg_type)) pref.vore_egg_type = sanitize_inlist(pref.vore_egg_type, valid_vore_egg_types, initial(pref.vore_egg_type))
/datum/category_item/player_setup_item/vore/egg/copy_to_mob(var/mob/living/carbon/human/character) /datum/category_item/player_setup_item/vore/egg/copy_to_mob(var/mob/living/carbon/human/character)
character.egg_type = pref.egg_type character.vore_egg_type = pref.vore_egg_type
/datum/category_item/player_setup_item/vore/egg/content(var/mob/user) /datum/category_item/player_setup_item/vore/egg/content(var/mob/user)
. += "<br>" . += "<br>"
. += " Egg Type: <a href='?src=\ref[src];egg_type=1'>[pref.egg_type]</a><br>" . += " Egg Type: <a href='?src=\ref[src];vore_egg_type=1'>[pref.vore_egg_type]</a><br>"
/datum/category_item/player_setup_item/vore/egg/OnTopic(var/href, var/list/href_list, var/mob/user) /datum/category_item/player_setup_item/vore/egg/OnTopic(var/href, var/list/href_list, var/mob/user)
if(!CanUseTopic(user)) if(!CanUseTopic(user))
return TOPIC_NOACTION return TOPIC_NOACTION
else if(href_list["egg_type"]) else if(href_list["vore_egg_type"])
var/list/egg_types = global_egg_types var/list/vore_egg_types = global_vore_egg_types
var/selection = input(user, "Choose your character's egg type:", "Character Preference", pref.egg_type) as null|anything in egg_types var/selection = input(user, "Choose your character's egg type:", "Character Preference", pref.vore_egg_type) as null|anything in vore_egg_types
if(selection) if(selection)
pref.egg_type = egg_types[selection] pref.vore_egg_type = vore_egg_types[selection]
return TOPIC_REFRESH return TOPIC_REFRESH
else else
return return