cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 13:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-11715

Browse Source
This commit is contained in:
Nadyr
2021-10-27 20:25:43 -04:00
committed by GitHub
parent a4efe1b256 2b394a1bf0
commit 7f5305920d
91 changed files with 2753 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/02_language.dm
+1
View File
@@ -34,6 +34,7 @@
for(var/language in pref.alternate_languages)
var/datum/language/L = GLOB.all_languages[language]
if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && pref.client && !is_lang_whitelisted(pref.client, L)))
testing("LANGSANI: Removed [L?.name || "lang not found"] from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] because it failed allowed checks")
pref.alternate_languages -= language
if(isnull(pref.language_prefixes) || !pref.language_prefixes.len)
code/modules/client/preference_setup/loadout/loadout_mask.dm
+1 -15
View File
@@ -29,19 +29,6 @@
/datum/gear/mask/plaguedoctor2
display_name = "golden plague doctor's mask"
path = /obj/item/clothing/mask/gas/plaguedoctor/gold
<<<<<<< HEAD
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
||||||| parent of d86c1ee773... Merge pull request #11715 from PastelPrinceDan/gaitersecondtry
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
/datum/gear/mask/papermask
display_name = "paper mask"
path = /obj/item/clothing/mask/paper
/datum/gear/mask/emotionalmask
display_name = "emotional mask"
path = /obj/item/clothing/mask/emotions
=======
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
/datum/gear/mask/papermask
@@ -63,5 +50,4 @@
for(var/gaiter in typesof(/obj/item/clothing/mask/gaiter))
var/obj/item/clothing/mask/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
>>>>>>> d86c1ee773... Merge pull request #11715 from PastelPrinceDan/gaitersecondtry
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
code/modules/client/preference_setup/loadout/loadout_utility.dm
+19 -19
View File
@@ -89,37 +89,37 @@
display_name = "flashlight"
path = /obj/item/device/flashlight
/datum/gear/utility/flashlight_blue
display_name = "flashlight, blue"
path = /obj/item/device/flashlight/color
/datum/gear/utility/flashlight_orange
display_name = "flashlight, orange"
path = /obj/item/device/flashlight/color/orange
/datum/gear/utility/flashlight_red
display_name = "flashlight, red"
path = /obj/item/device/flashlight/color/red
/datum/gear/utility/flashlight_yellow
display_name = "flashlight, yellow"
path = /obj/item/device/flashlight/color/yellow
/datum/gear/utility/maglight
display_name = "flashlight, maglight"
path = /obj/item/device/flashlight/maglight
cost = 2
/datum/gear/utility/flashlight/color
display_name = "flashlight, small (selection)"
path = /obj/item/device/flashlight/color
/datum/gear/utility/flashlight/color/New()
..()
var/list/flashlights = list(
"Blue Flashlight" = /obj/item/device/flashlight/color,
"Red Flashlight" = /obj/item/device/flashlight/color/red,
"Green Flashlight" = /obj/item/device/flashlight/color/green,
"Yellow Flashlight" = /obj/item/device/flashlight/color/yellow,
"Purple Flashlight" = /obj/item/device/flashlight/color/purple,
"Orange Flashlight" = /obj/item/device/flashlight/color/orange
)
gear_tweaks += new/datum/gear_tweak/path(flashlights)
/datum/gear/utility/battery
display_name = "cell, device"
path = /obj/item/weapon/cell/device
/datum/gear/utility/pen
display_name = "Fountain Pen"
display_name = "fountain pen"
path = /obj/item/weapon/pen/fountain
/datum/gear/utility/umbrella
display_name = "Umbrella"
display_name = "umbrella"
path = /obj/item/weapon/melee/umbrella
cost = 3
@@ -131,7 +131,7 @@
display_name = "wheelchair selection"
path = /obj/item/wheelchair
cost = 4
/datum/gear/utility/wheelchair/New()
..()
gear_tweaks += gear_tweak_free_color_choice