diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm index 7016415d48..3dcbd50bee 100644 --- a/code/_globalvars/genetics.dm +++ b/code/_globalvars/genetics.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD ////////////// GLOBAL_VAR_INIT(NEARSIGHTBLOCK, 0) GLOBAL_VAR_INIT(EPILEPSYBLOCK, 0) @@ -25,4 +26,33 @@ GLOBAL_LIST_EMPTY(global_mutations) // list of hidden mutation things GLOBAL_LIST_EMPTY(bad_mutations) GLOBAL_LIST_EMPTY(good_mutations) +======= + ////////////// +GLOBAL_VAR_INIT(NEARSIGHTBLOCK, 0) +GLOBAL_VAR_INIT(EPILEPSYBLOCK, 0) +GLOBAL_VAR_INIT(COUGHBLOCK, 0) +GLOBAL_VAR_INIT(TOURETTESBLOCK, 0) +GLOBAL_VAR_INIT(NERVOUSBLOCK, 0) +GLOBAL_VAR_INIT(BLINDBLOCK, 0) +GLOBAL_VAR_INIT(DEAFBLOCK, 0) +GLOBAL_VAR_INIT(HULKBLOCK, 0) +GLOBAL_VAR_INIT(TELEBLOCK, 0) +GLOBAL_VAR_INIT(FIREBLOCK, 0) +GLOBAL_VAR_INIT(XRAYBLOCK, 0) +GLOBAL_VAR_INIT(CLUMSYBLOCK, 0) +GLOBAL_VAR_INIT(STRANGEBLOCK, 0) +GLOBAL_VAR_INIT(RACEBLOCK, 0) + +GLOBAL_LIST(bad_se_blocks) +GLOBAL_LIST(good_se_blocks) +GLOBAL_LIST(op_se_blocks) + +GLOBAL_VAR(NULLED_SE) +GLOBAL_VAR(NULLED_UI) + +GLOBAL_LIST_EMPTY(global_mutations) // list of hidden mutation things + +GLOBAL_LIST_EMPTY(bad_mutations) +GLOBAL_LIST_EMPTY(good_mutations) +>>>>>>> d1c1a28... adds italian moustache that makes you italian (#35426) GLOBAL_LIST_EMPTY(not_good_mutations) \ No newline at end of file diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 38c7e2d118..446a15c547 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -40,6 +40,63 @@ icon_state = "fake-moustache" flags_inv = HIDEFACE +/obj/item/clothing/mask/fakemoustache/italian + name = "italian moustache" + desc = "Made from authentic Italian moustache hairs. Gives the wearer an irresistable urge to gesticulate wildly." + +/obj/item/clothing/mask/fakemoustache/italian/speechModification(message) + if(copytext(message, 1, 2) != "*") + message = " [message] " + message = replacetext(message," mom "," mamma ") + message = replacetext(message," dad "," pappa ") + message = replacetext(message," baby ",pick(" bambino "," little sausage roll ")) + message = replacetext(message,"spicy","a-spicy") + message = replacetext(message,"I'm","I'm-a") + message = replacetext(message," friend "," enemy-a ") + message = replacetext(message," enemy "," friend-a ") + message = replacetext(message,"traitor","mafioso") + message = replacetext(message," operative "," greek ") + message = replacetext(message," op "," greek ") + message = replacetext(message," ops "," greeks") + message = replacetext(message," operative "," greek") + message = replacetext(message," operatives "," greeks") + message = replacetext(message," nuke"," spiciest-a meatball") + message = replacetext(message," good"," molto bene") + message = replacetext(message," why"," for-a what reason") + message = replacetext(message," my "," my-a ") + message = replacetext(message,"it's","it's-a") + message = replacetext(message," bad"," molto male") + message = replacetext(message," sing "," sing-a ") + message = replacetext(message," cook "," cook-a ") + message = replacetext(message," want "," want-a ") + message = replacetext(message," what's "," what's-a ") + message = replacetext(message," shitcurity"," carabinieri") + message = replacetext(message," shitsec"," carabinieri") + message = replacetext(message," and "," and-a ") + message = replacetext(message," am "," am-a ") + message = replacetext(message," assistant "," goombah ") + message = replacetext(message," greytide "," curvisti ") + message = replacetext(message," greytider "," curvisti ") + message = replacetext(message," captain "," capitano ") + message = replacetext(message," sec "," polizia ") + message = replacetext(message," security "," polizia ") + message = replacetext(message,"cheese",pick("parmesano","gorgonzola")) + message = replacetext(message," meat",pick(" pepperoni"," prosciutto")) + message = replacetext(message,"who's","who's-a") + message = replacetext(message,"hello",pick("ciao","buongiorno")) + message = replacetext(message," bye ",pick(" ciao "," arrivederci ")) + message = replacetext(message,"thing","thing-a") + message = replacetext(message,"whose","whose-a") + message = replacetext(message,"thanks","grazie") + message = replacetext(message," wine"," vino") + message = replacetext(message,"could","could-a") + message = replacetext(message," use"," use-a") + message = replacetext(message," make"," make-a") + message = replacetext(message,"spaghetti", "SPAGHETT") + if(prob(3)) + message += pick(" Ravioli, ravioli, give me the formuoli!"," Mamma-mia!"," Mamma-mia! That's a spicy meat-ball!", " La la la la la funiculi funicula!") + return trim(message) + /obj/item/clothing/mask/joy name = "joy mask" desc = "Express your happiness or hide your sorrows with this laughing face with crying tears of joy cutout." diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index ee44a16db5..11c661ce4b 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -195,6 +195,7 @@ Cook uniform = /obj/item/clothing/under/rank/chef suit = /obj/item/clothing/suit/toggle/chef head = /obj/item/clothing/head/chefhat + mask = /obj/item/clothing/mask/fakemoustache/italian backpack_contents = list(/obj/item/sharpener = 1) /datum/outfit/job/cook/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)