cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
This commit is contained in:
Repede
2020-02-22 12:38:04 -05:00
parent 7fc70caa43 5ab3654a44
commit 4cf7f71be6
905 changed files with 89234 additions and 7194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/01_basic.dm
+2 -2
View File
@@ -88,7 +88,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
pref.real_name = new_name
return TOPIC_REFRESH
else
user << "<span class='warning'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</span>"
to_chat(user, "<span class='warning'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</span>")
return TOPIC_NOACTION
else if(href_list["random_name"])
@@ -107,7 +107,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
pref.nickname = new_nickname
return TOPIC_REFRESH
else
user << "<span class='warning'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</span>"
to_chat(user, "<span class='warning'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</span>")
return TOPIC_NOACTION
else if(href_list["bio_gender"])
code/modules/client/preference_setup/general/03_body.dm
+1 -1
View File
@@ -741,7 +741,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
organ = O_STOMACH
if("Brain")
if(pref.organ_data[BP_HEAD] != "cyborg")
user << "<span class='warning'>You may only select a cybernetic or synthetic brain if you have a full prosthetic body.</span>"
to_chat(user, "<span class='warning'>You may only select a cybernetic or synthetic brain if you have a full prosthetic body.</span>")
return
organ = "brain"
code/modules/client/preference_setup/global/04_ooc.dm
+1 -1
View File
@@ -33,7 +33,7 @@
if(player_to_ignore)
player_to_ignore = sanitize(ckey(player_to_ignore))
if(player_to_ignore == user.ckey)
user <<"<span class='notice'>You can't ignore yourself.</span>"
to_chat(user, "<span class='notice'>You can't ignore yourself.</span>")
return TOPIC_REFRESH
pref.ignored_players |= player_to_ignore
return TOPIC_REFRESH
code/modules/client/preference_setup/loadout/loadout.dm
+3 -3
View File
@@ -92,16 +92,16 @@ var/list/gear_datums = list()
var/total_cost = 0
for(var/gear_name in pref.gear)
if(!gear_datums[gear_name])
preference_mob << "<span class='warning'>You cannot have more than one of the \the [gear_name]</span>"
to_chat(preference_mob, "<span class='warning'>You cannot have more than one of the \the [gear_name]</span>")
pref.gear -= gear_name
else if(!(gear_name in valid_gear_choices()))
preference_mob << "<span class='warning'>You cannot take \the [gear_name] as you are not whitelisted for the species or item.</span>" //Vorestation Edit
to_chat(preference_mob, "<span class='warning'>You cannot take \the [gear_name] as you are not whitelisted for the species or item.</span>") //Vorestation Edit
pref.gear -= gear_name
else
var/datum/gear/G = gear_datums[gear_name]
if(total_cost + G.cost > MAX_GEAR_COST)
pref.gear -= gear_name
preference_mob << "<span class='warning'>You cannot afford to take \the [gear_name]</span>"
to_chat(preference_mob, "<span class='warning'>You cannot afford to take \the [gear_name]</span>")
else
total_cost += G.cost
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+20 -2
View File
@@ -51,14 +51,14 @@
display_name = "centcom medical uniform"
description = "A medical uniform straight from Central Command."
ckeywhitelist = list("arokha")
character_name = list("Aronai Kadigan")
character_name = list("Aronai Sieyes")
/datum/gear/fluff/aronai_ccmedjacket
path = /obj/item/clothing/suit/storage/service/sifguard/medical/command
display_name = "centcom medical jacket"
description = "A medical jacket straight from Central Command."
ckeywhitelist = list("arokha")
character_name = list("Aronai Kadigan")
character_name = list("Aronai Sieyes")
// B CKEYS
/datum/gear/fluff/yuuko_kimono
@@ -461,6 +461,12 @@
ckeywhitelist = list("kisukegema")
character_name = list("Kisuke Gema")
/datum/gear/fluff/excess_collar
path = /obj/item/clothing/accessory/collar/pink/fluff/warning
display_name = "Excess's Collar"
ckeywhitelist = list("killerdragn")
character_name = list("Excess")
/datum/gear/fluff/lassara_sheath
path = /obj/item/clothing/accessory/storage/knifeharness
display_name = "Lassara's Knife Harness"
@@ -753,6 +759,18 @@
ckeywhitelist = list("thedavestdave")
character_name = list("Nick Sloan")
/datum/gear/fluff/roy_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Roy's Unity Medal"
ckeywhitelist = list("thedavestdave")
character_name = list("Roy Tilton")
/datum/gear/fluff/monty_balaclava
path = /obj/item/clothing/mask/balaclava
display_name = "Monty's Balaclava"
ckeywhitelist = list("theskringdinger")
character_name = list("Monty Kopic")
/datum/gear/fluff/konor_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Konor's Unity Medal"
code/modules/client/preference_setup/loadout/loadout_general.dm
+30
View File
@@ -50,6 +50,36 @@
plushies[initial(plushie_type.name)] = plushie_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies))
/datum/gear/figure
display_name = "action figure selection"
description = "A \"Space Life\" brand action figure."
path = /obj/item/toy/figure/
/datum/gear/figure/New()
..()
var/list/figures = list()
for(var/figure in typesof(/obj/item/toy/figure/) - /obj/item/toy/figure)
var/obj/item/toy/figure/figure_type = figure
figures[initial(figure_type.name)] = figure_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(figures))
/datum/gear/toy
display_name = "toy selection"
description = "Choose from a number of toys."
path = /obj/item/toy/
/datum/gear/toy/New()
..()
var/toytype = list()
toytype["Blink toy"] = /obj/item/toy/blink
toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy
toytype["Water flower"] = /obj/item/toy/waterflower
toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle
toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball
toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch
gear_tweaks += new/datum/gear_tweak/path(toytype)
/datum/gear/flask
display_name = "flask"
path = /obj/item/weapon/reagent_containers/food/drinks/flask/barflask
code/modules/client/preference_setup/traits/traits.dm
+2 -2
View File
@@ -102,14 +102,14 @@ var/list/trait_categories = list() // The categories available for the trait men
for(var/trait_name in pref.traits)
if(!trait_datums[trait_name])
preference_mob << "<span class='warning'>You cannot have more than one of trait: [trait_name]</span>"
to_chat(preference_mob, "<span class='warning'>You cannot have more than one of trait: [trait_name]</span>")
pref.traits -= trait_name
else
var/datum/trait/T = trait_datums[trait_name]
var/invalidity = T.test_for_invalidity(src)
if(invalidity)
pref.traits -= trait_name
preference_mob << "<span class='warning'>You cannot take the [trait_name] trait. Reason: [invalidity]</span>"
to_chat(preference_mob, "<span class='warning'>You cannot take the [trait_name] trait. Reason: [invalidity]</span>")
var/conflicts = T.test_for_trait_conflict(pref.traits)
if(conflicts)
code/modules/client/preference_setup/vore/02_size.dm
+1 -1
View File
@@ -62,7 +62,7 @@
var/new_size = input(user, "Choose your character's size, ranging from 25% to 200%", "Set Size") as num|null
if (!ISINRANGE(new_size,25,200))
pref.size_multiplier = 1
user << "<span class='notice'>Invalid size.</span>"
to_chat(user, "<span class='notice'>Invalid size.</span>")
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(new_size)
pref.size_multiplier = (new_size/100)