diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index 75fd103c73a2a..1d94954d348ab 100644 --- a/_maps/RandomRuins/SpaceRuins/bus.dmm +++ b/_maps/RandomRuins/SpaceRuins/bus.dmm @@ -62,7 +62,7 @@ /area/ruin/unpowered/no_grav) "an" = ( /obj/structure/fluff/bus/passable/seat, -/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/meatball, /turf/open/floor/plasteel/airless/dark{ icon_state = "bus" }, @@ -83,7 +83,7 @@ /area/ruin/unpowered/no_grav) "aq" = ( /obj/structure/fluff/bus/passable/seat, -/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/meatball, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/airless/dark{ icon_state = "bus" @@ -146,9 +146,9 @@ "aA" = ( /obj/structure/fluff/bus/passable, /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/faggot, -/obj/item/reagent_containers/food/snacks/faggot, -/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/meatball, +/obj/item/reagent_containers/food/snacks/meatball, +/obj/item/reagent_containers/food/snacks/meatball, /turf/open/floor/plasteel/airless/dark{ icon_state = "bus" }, @@ -170,7 +170,7 @@ /area/ruin/unpowered/no_grav) "aD" = ( /obj/structure/fluff/bus/passable, -/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/meatball, /turf/open/floor/plasteel/airless/dark{ icon_state = "bus" }, @@ -242,7 +242,7 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aP" = ( -/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/meatball, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aQ" = ( @@ -266,7 +266,7 @@ "aU" = ( /obj/structure/fluff/bus/passable/seat, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/meatball, /turf/open/floor/plasteel/airless/dark{ icon_state = "bus" }, @@ -297,7 +297,7 @@ "aZ" = ( /obj/structure/fluff/bus/passable, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/meatball, /turf/open/floor/plasteel/airless/dark{ icon_state = "bus" }, diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 8f8f05fd6789b..5cdb6f4514656 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -23,7 +23,6 @@ #define CHAMELEON /datum/mutation/human/chameleon #define WACKY /datum/mutation/human/wacky #define MUT_MUTE /datum/mutation/human/mute -#define SMILE /datum/mutation/human/smile #define STONER /datum/mutation/human/stoner #define UNINTELLIGIBLE /datum/mutation/human/unintelligible #define SWEDISH /datum/mutation/human/swedish diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 201e29fabc208..fb8ad6d77f357 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -103,7 +103,7 @@ //flags for covering body parts #define GLASSESCOVERSEYES (1<<0) -#define MASKCOVERSEYES (1<<1) // get rid of some of the other retardation in these flags +#define MASKCOVERSEYES (1<<1) // get rid of some of the other stupidness in these flags #define HEADCOVERSEYES (1<<2) // feel free to realloc these numbers for other purposes #define MASKCOVERSMOUTH (1<<3) // on other items, these are just for mask/head #define HEADCOVERSMOUTH (1<<4) diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index a226da8472f6f..b7a74615cb7f4 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -9,7 +9,7 @@ viable_mobtypes = list(/mob/living/carbon/human) disease_flags = CAN_CARRY|CAN_RESIST|CURABLE permeability_mod = 0.75 - desc = "Some speculate that this virus is the cause of the Space Wizard Federation's existence. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition." + desc = "Some speculate that this virus is the cause of the Space Wizard Federation's existence. Subjects affected show the signs of brain damage, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition." severity = DISEASE_SEVERITY_HARMFUL required_organs = list(/obj/item/bodypart/head) diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index 1399f63d77893..8b74d8e5fac39 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -20,7 +20,7 @@ sheet_type = /obj/item/stack/sheet/glass value_per_unit = 0.0025 beauty_modifier = 0.05 - armor_modifiers = list("melee" = 0.2, "bullet" = 0.2, "laser" = 0, "energy" = 1, "bomb" = 0, "bio" = 0.2, "rad" = 0.2, "fire" = 1, "acid" = 0.2) // yeah ok retard + armor_modifiers = list("melee" = 0.2, "bullet" = 0.2, "laser" = 0, "energy" = 1, "bomb" = 0, "bio" = 0.2, "rad" = 0.2, "fire" = 1, "acid" = 0.2) /* Color matrices are like regular colors but unlike with normal colors, you can go over 255 on a channel. diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 84584ccac1b8b..bbd39924d8430 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -49,76 +49,6 @@ return REMOVE_TRAIT(owner, TRAIT_MUTE, GENETIC_MUTATION) - -/datum/mutation/human/smile - name = "Smile" - desc = "Causes the user to be in constant mania." - quality = MINOR_NEGATIVE - text_gain_indication = "You feel so happy. Nothing can be wrong with anything. :)" - text_lose_indication = "Everything is terrible again. :(" - -/datum/mutation/human/smile/on_acquiring(mob/living/carbon/human/owner) - if(..()) - return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) - -/datum/mutation/human/smile/on_losing(mob/living/carbon/human/owner) - if(..()) - return - UnregisterSignal(owner, COMSIG_MOB_SAY) - -/datum/mutation/human/smile/proc/handle_speech(datum/source, list/speech_args) - var/message = speech_args[SPEECH_MESSAGE] - if(message) - message = " [message] " - //Time for a friendly game of SS13 - message = replacetext(message," stupid "," smart ") - message = replacetext(message," retard "," genius ") - message = replacetext(message," unrobust "," robust ") - message = replacetext(message," dumb "," smart ") - message = replacetext(message," awful "," great ") - message = replacetext(message," gay ",pick(" nice "," ok "," alright ")) - message = replacetext(message," horrible "," fun ") - message = replacetext(message," terrible "," terribly fun ") - message = replacetext(message," terrifying "," wonderful ") - message = replacetext(message," gross "," cool ") - message = replacetext(message," disgusting "," amazing ") - message = replacetext(message," loser "," winner ") - message = replacetext(message," useless "," useful ") - message = replacetext(message," oh god "," cheese and crackers ") - message = replacetext(message," jesus "," gee wiz ") - message = replacetext(message," weak "," strong ") - message = replacetext(message," kill "," hug ") - message = replacetext(message," murder "," tease ") - message = replacetext(message," ugly "," beautiful ") - message = replacetext(message," douchbag "," nice guy ") - message = replacetext(message," douchebag "," nice guy ") - message = replacetext(message," whore "," lady ") - message = replacetext(message," nerd "," smart guy ") - message = replacetext(message," moron "," fun person ") - message = replacetext(message," IT'S LOOSE "," EVERYTHING IS FINE ") - message = replacetext(message," sex "," hug fight ") - message = replacetext(message," idiot "," genius ") - message = replacetext(message," fat "," thin ") - message = replacetext(message," beer "," water with ice ") - message = replacetext(message," drink "," water ") - message = replacetext(message," feminist "," empowered woman ") - message = replacetext(message," i hate you "," you're mean ") - message = replacetext(message," nigger "," african american ") - message = replacetext(message," jew "," jewish ") - message = replacetext(message," shit "," shiz ") - message = replacetext(message," crap "," poo ") - message = replacetext(message," slut "," tease ") - message = replacetext(message," ass "," butt ") - message = replacetext(message," damn "," dang ") - message = replacetext(message," fuck "," ") - message = replacetext(message," penis "," privates ") - message = replacetext(message," cunt "," privates ") - message = replacetext(message," dick "," jerk ") - message = replacetext(message," vagina "," privates ") - speech_args[SPEECH_MESSAGE] = trim(message) - - /datum/mutation/human/unintelligible name = "Unintelligible" desc = "Partially inhibits the vocal center of the brain, severely distorting speech." @@ -251,7 +181,6 @@ message = replacetext(message," thanks "," thank you, thank you very much ") message = replacetext(message," what are you "," whatcha ") message = replacetext(message," yes ",pick(" sure", "yea ")) - message = replacetext(message," faggot "," square ") message = replacetext(message," muh valids "," my kicks ") speech_args[SPEECH_MESSAGE] = trim(message) diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index e8ef0674f554b..37aca0144149c 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -249,14 +249,6 @@ name = "\improper DNA injector (Mute)" add_mutations = list(MUT_MUTE) -/obj/item/dnainjector/antismile - name = "\improper DNA injector (Anti-Smile)" - remove_mutations = list(SMILE) - -/obj/item/dnainjector/smilemut - name = "\improper DNA injector (Smile)" - add_mutations = list(SMILE) - /obj/item/dnainjector/unintelligiblemut name = "\improper DNA injector (Unintelligible)" add_mutations = list(UNINTELLIGIBLE) diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index f9d2aa9d34d13..7ecd444c08fbf 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -164,7 +164,7 @@ It can cook multiple items at once.

Processor:

- Use it to process certain ingredients (meat into faggot, doughslice into spaghetti, potato into fries,etc...) + Use it to process certain ingredients (meat into meatballs, doughslice into spaghetti, potato into fries,etc...)

Gibber:

Stuff an animal in it to grind it into meat. diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 4b78f81b8c266..5985436b18c74 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1002,7 +1002,7 @@ /obj/item/storage/box/ingredients/italian/PopulateContents() for(var/i in 1 to 3) new /obj/item/reagent_containers/food/snacks/grown/tomato(src) - new /obj/item/reagent_containers/food/snacks/faggot(src) + new /obj/item/reagent_containers/food/snacks/meatball(src) new /obj/item/reagent_containers/food/drinks/bottle/wine(src) /obj/item/storage/box/ingredients/vegetarian @@ -1025,7 +1025,7 @@ new /obj/item/reagent_containers/food/snacks/grown/potato(src) new /obj/item/reagent_containers/food/snacks/grown/tomato(src) new /obj/item/reagent_containers/food/snacks/grown/corn(src) - new /obj/item/reagent_containers/food/snacks/faggot(src) + new /obj/item/reagent_containers/food/snacks/meatball(src) /obj/item/storage/box/ingredients/fruity theme_name = "fruity" @@ -1081,7 +1081,7 @@ new /obj/item/reagent_containers/food/snacks/carpmeat(src) new /obj/item/reagent_containers/food/snacks/meat/slab/xeno(src) new /obj/item/reagent_containers/food/snacks/meat/slab/corgi(src) - new /obj/item/reagent_containers/food/snacks/faggot(src) + new /obj/item/reagent_containers/food/snacks/meatball(src) /obj/item/storage/box/ingredients/exotic theme_name = "exotic" diff --git a/code/game/objects/structures/signs/signs_plaques.dm b/code/game/objects/structures/signs/signs_plaques.dm index 317f556e8d704..68caf105d01e2 100644 --- a/code/game/objects/structures/signs/signs_plaques.dm +++ b/code/game/objects/structures/signs/signs_plaques.dm @@ -23,7 +23,7 @@ /obj/structure/sign/plaques/kiddie name = "\improper AI developers plaque" - desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"." + desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be disabled. Beneath the image, someone has scratched the word \"PACKETS\"." icon_state = "kiddieplaque" /obj/structure/sign/plaques/kiddie/badger diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 490b26a209b4e..bac573b6e08c1 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -58,7 +58,7 @@ Summon Events (Toggle)
There can only be one!
There can only be one! (40-second delay)
- Make all players retarded
+ Make all players brain damaged
Egalitarian Station Mode
Anarcho-Capitalist Station Mode
Break all lights
@@ -450,14 +450,14 @@ DO.virus_type = virus E = DO - if("retardify") + if("massbraindamage") if(!check_rights(R_FUN)) return SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Mass Braindamage")) for(var/mob/living/carbon/human/H in GLOB.player_list) to_chat(H, "You suddenly feel stupid.", confidential = TRUE) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60, 80) - message_admins("[key_name_admin(usr)] made everybody retarded") + message_admins("[key_name_admin(usr)] made everybody brain damaged") if("eagles")//SCRAW if(!check_rights(R_FUN)) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index e5fe5bc62d2a8..05f3d39d7afc1 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -101,10 +101,10 @@ tastes = list("meat" = 1, "salmon" = 1) foodtype = MEAT | ALCOHOL -/obj/item/reagent_containers/food/snacks/faggot - name = "faggot" +/obj/item/reagent_containers/food/snacks/meatball + name = "meatball" desc = "A great meal all round. Not a cord of wood." - icon_state = "faggot" + icon_state = "meatball" list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1) filling_color = "#800000" tastes = list("meat" = 1) diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm index 4ed027dcdd2b9..55db7cf06b84f 100644 --- a/code/modules/food_and_drinks/recipes/processor_recipes.dm +++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm @@ -7,7 +7,7 @@ /datum/food_processor_process/meat input = /obj/item/reagent_containers/food/snacks/meat/slab - output = /obj/item/reagent_containers/food/snacks/faggot + output = /obj/item/reagent_containers/food/snacks/meatball /datum/food_processor_process/bacon input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index 9c8b40d734bce..592b4c5c1cf40 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -148,7 +148,7 @@ /datum/crafting_recipe/food/sausage name = "Sausage" reqs = list( - /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, /obj/item/reagent_containers/food/snacks/meat/cutlet = 2 ) result = /obj/item/reagent_containers/food/snacks/sausage @@ -167,7 +167,7 @@ reqs = list( /obj/item/reagent_containers/food/snacks/doughslice = 1, /obj/item/reagent_containers/food/snacks/grown/garlic = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 + /obj/item/reagent_containers/food/snacks/meatball = 1 ) result = /obj/item/reagent_containers/food/snacks/rawkhinkali subcategory = CAT_MEAT diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 364658dbc507e..07e2e4a9340ea 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -322,7 +322,7 @@ datum/crafting_recipe/food/donut/meat name = "Donk-pocket" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 + /obj/item/reagent_containers/food/snacks/meatball = 1 ) result = /obj/item/reagent_containers/food/snacks/donkpocket subcategory = CAT_PASTRY @@ -342,7 +342,7 @@ datum/crafting_recipe/food/donut/meat name = "Spicy-pocket" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, /obj/item/reagent_containers/food/snacks/grown/chili ) result = /obj/item/reagent_containers/food/snacks/donkpocket/spicy @@ -353,7 +353,7 @@ datum/crafting_recipe/food/donut/meat name = "Teriyaki-pocket" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, /datum/reagent/consumable/soysauce = 3 ) result = /obj/item/reagent_containers/food/snacks/donkpocket/teriyaki @@ -364,7 +364,7 @@ datum/crafting_recipe/food/donut/meat name = "Pizza-pocket" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, /obj/item/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/reagent_containers/food/snacks/donkpocket/pizza @@ -396,7 +396,7 @@ datum/crafting_recipe/food/donut/meat name = "Gondola-pocket" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, /datum/reagent/tranquility = 5 ) result = /obj/item/reagent_containers/food/snacks/donkpocket/gondola @@ -463,7 +463,7 @@ datum/crafting_recipe/food/donut/meat reqs = list( /datum/reagent/consumable/soysauce = 5, /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 ) result = /obj/item/reagent_containers/food/snacks/meatbun diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm index 70f4b50727371..2cb668df4fd09 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -83,7 +83,7 @@ name = "Sassysage pizza" reqs = list( /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/faggot = 3, + /obj/item/reagent_containers/food/snacks/meatball = 3, /obj/item/reagent_containers/food/snacks/cheesewedge = 1, /obj/item/reagent_containers/food/snacks/grown/tomato = 1 ) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index 39eeb7d9369ff..920691bcb7554 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -29,7 +29,7 @@ /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, /obj/item/reagent_containers/food/snacks/grown/potato = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 + /obj/item/reagent_containers/food/snacks/meatball = 1 ) result = /obj/item/reagent_containers/food/snacks/salad/validsalad subcategory = CAT_SALAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index 338cbe191e8ee..7f5b6c4ed34a2 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -8,7 +8,7 @@ reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, /obj/item/reagent_containers/food/snacks/grown/carrot = 1, /obj/item/reagent_containers/food/snacks/grown/potato = 1 ) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm index a3cc40fbda609..796c360c34487 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm @@ -24,7 +24,7 @@ name = "Spaghetti meatball" reqs = list( /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti = 1, - /obj/item/reagent_containers/food/snacks/faggot = 2 + /obj/item/reagent_containers/food/snacks/meatball = 2 ) result = /obj/item/reagent_containers/food/snacks/spaghetti/meatballspaghetti subcategory = CAT_SPAGHETTI @@ -33,7 +33,7 @@ name = "Spesslaw" reqs = list( /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti = 1, - /obj/item/reagent_containers/food/snacks/faggot = 4 + /obj/item/reagent_containers/food/snacks/meatball = 4 ) result = /obj/item/reagent_containers/food/snacks/spaghetti/spesslaw subcategory = CAT_SPAGHETTI diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 6f3f2e748f2e3..677b49f46c35e 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -219,7 +219,7 @@ /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/blackpepper = 1, /obj/item/reagent_containers/food/snacks/boiledegg = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 + /obj/item/reagent_containers/food/snacks/meatball = 1 ) result = /obj/item/reagent_containers/food/snacks/scotchegg subcategory = CAT_MISCFOOD diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 03c38ee8fc600..52b46794f3bfe 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -77,7 +77,7 @@ B.name = "Fluorescent Incandescence" if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks", "meme", "memes") B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition","F.A.T.A.L. Rulebook") - H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100) // starts off retarded as fuck + H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100) // starts off brain damaged as fuck if("monkeyism","apism","gorillism","primatism") B.name = pick("Going Bananas", "Bananas Out For Harambe") if("mormonism") diff --git a/code/modules/lighting/lighting_corner.dm b/code/modules/lighting/lighting_corner.dm index cf800e23e25ec..78313ae6bf4ca 100644 --- a/code/modules/lighting/lighting_corner.dm +++ b/code/modules/lighting/lighting_corner.dm @@ -138,6 +138,6 @@ GLOBAL_LIST_INIT(LIGHTING_CORNER_DIAGONAL, list(NORTHEAST, SOUTHEAST, SOUTHWEST, if (!force) return QDEL_HINT_LETMELIVE - stack_trace("Ok, Look, /tg/, I need you to find whatever fucker decided to call qdel on a fucking lighting corner, then tell him very nicely and politely that he is 100% retarded and needs his head checked. Thanks. Send them my regards by the way.") + stack_trace("Ok, Look, /tg/, I need you to find whatever fucker decided to call qdel on a fucking lighting corner, then tell him very nicely and politely that he is brain damaged and needs his head checked. Thanks. Send them my regards by the way.") return ..() diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index 3502bc1d867aa..4362feadbda3d 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -347,7 +347,7 @@ name = "Flat Top (Big)" icon_state = "hair_bigflattop" -/datum/sprite_accessory/hair/fag +/datum/sprite_accessory/hair/flow_hair name = "Flow Hair" icon_state = "hair_f" diff --git a/html/archivedchangelog.html b/html/archivedchangelog.html index 033acbaca9453..12f7b2394e5d4 100644 --- a/html/archivedchangelog.html +++ b/html/archivedchangelog.html @@ -6394,7 +6394,7 @@

Erro updated:

\ No newline at end of file + diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 90a538b118be4..6967bed06264a 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -154,7 +154,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - unknown: Fixed the syndicate nuclear victory bug - unknown: Wizard now spawns with wizard outfit which he must wear to cast spells - unknown: Blood bug fixes - - unknown: Fixed a retarded bug that meant I didn't have the power to kick admins + - unknown: Fixed a stupid bug that meant I didn't have the power to kick admins - unknown: THUNDERDOME! - unknown: Several new facial hair options and a bitchin' mohawk - unknown: Blood by Culka @@ -329,7 +329,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. \ code. Re-did \n my antimatter engine code so it actually puts out power\ \ now" - unknown: "dumb as fuck change, whoever did that, it already spawn ()&#39;s\ - \ inside the proc \n code, whoever did that, you are a faggot and should\ + \ inside the proc \n code, whoever did that, you are a fool and should\ \ read code before you modify \n it" - unknown: Fixed a bug that gave everyone modify ticker variables you silly sausage. - unknown: Sorted the AIs track list. @@ -436,7 +436,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. \ floors.\n\t \n\t\n " - unknown: "\n\tNew spell: Mindblast\n\t\n " + \ brain damaged.\n\t \n\t\n " - unknown: "\n\tAlien Races\n\t\n " @@ -707,7 +707,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. \ milk\n\t\t-Meatbread: 3 meats (whatever meats) 3 flour 3 cheese. Can be sliced.\n\ \tCheese_amount is actually displayed on the microwave." - unknown: ' Profession-special radio channels now have color.' - - unknown: ' AI card not retardedly lethal anymore, for anyone that didn''t notice' + - unknown: ' AI card not stupidly lethal anymore, for anyone that didn''t notice' - unknown: ' HYDROPONICS OVERHAUL, credit goes to Skie and Numbers. Wood doesn''t have the entity so the tower caps cannot be harvested. For now.' - unknown: ' Bar is now barman-only, access-wise. No more shall the entire station @@ -2257,7 +2257,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. in maintenance shafts). Greek Rioter: - unknown: 'Removed dumb/badly sprited drinks for barman. This is for you, people - that love to play barman. Your job is now non-retarded again. EDIT: + that love to play barman. Your job is now non-stupid again. EDIT: FIXED DRINK MIXING' - unknown: 'More info here: rev2136' diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 6312a74b6b7d5..61c3f4b5a98c7 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/strings/ion_laws.json b/strings/ion_laws.json index d4b08d2a86449..4c6178dd7da3f 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -765,7 +765,7 @@ "THIRTEEN SEQUELS", "THREE WISHES", "A SITCOM", - "THAT GRIEFING FAGGOT GEORGE MELONS", + "THAT GRIEFING TRAITOR GEORGE MELONS", "FAT GIRLS ON BICYCLES", "SOMEBODY TO PUT YOU OUT OF YOUR MISERY", "HEROES IN A HALF SHELL", diff --git a/strings/names/death_commando.txt b/strings/names/death_commando.txt index b462a9fc54f87..d81ea8073dc29 100644 --- a/strings/names/death_commando.txt +++ b/strings/names/death_commando.txt @@ -79,7 +79,7 @@ Splint Chesthair Stabby McGee Stump Beefgnaw Stump Chunkman -THAT DAMN FAGGOT TRAITOR GEORGE MELONS +THAT DAMN GRIEFING TRAITOR GEORGE MELONS Theodore Pain Thick McRunfast Thrust Vanderhuge @@ -88,4 +88,4 @@ Toolboxl Rose Touch Rustrod Trunk Slamchest Van Darkholme -Zombie Gandhi \ No newline at end of file +Zombie Gandhi diff --git a/strings/phobia.json b/strings/phobia.json index 6a13129167705..9a5ebcffab4c8 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -84,7 +84,6 @@ "lizards": [ "lizard", - "ligger", "hiss", "hissed", "hissing", diff --git a/strings/traumas.json b/strings/traumas.json index 9883245fb2e4f..08e5afbd0c7c7 100644 --- a/strings/traumas.json +++ b/strings/traumas.json @@ -3,7 +3,7 @@ "@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "@pick(semicolon)CAPTAINS A COMDOM", - "@pick(semicolon)@pick(faggot_traitor) @pick(george) @pick(mellens) is grifing me HALP!!!", + "@pick(semicolon) @pick(george) @pick(mellens) is grifing me HALP!!!", "can u give me @pick(mutations)?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", @@ -91,12 +91,6 @@ "melons", "mwrlins" ], - - "faggot_traitor": [ - "", - "that faggot traitor" - ], - "random_gibberish": [ "g", "squid", @@ -142,14 +136,14 @@ "cock cult", "anteg" ], - + "bug": [ "", "IS TIS A BUG??", "SI IST A BUGG/", "BUG!!!" ], - + "semicolon": [ "", ";",