diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index c731bcac5e..2f5c14191b 100644 --- a/_maps/RandomRuins/SpaceRuins/bus.dmm +++ b/_maps/RandomRuins/SpaceRuins/bus.dmm @@ -66,7 +66,7 @@ /obj/structure/fluff/bus/passable/seat{ icon_state = "backseat" }, -/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/meatball, /turf/open/floor/plasteel/airless/dark{ icon_state = "bus" }, @@ -90,7 +90,7 @@ /obj/structure/fluff/bus/passable/seat{ icon_state = "backseat" }, -/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" @@ -158,9 +158,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" }, @@ -182,7 +182,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" }, @@ -256,7 +256,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" = ( @@ -282,7 +282,7 @@ icon_state = "backseat" }, /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" }, @@ -318,7 +318,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/inventory.dm b/code/__DEFINES/inventory.dm index fd50b8b70d..f42d199d0d 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -147,7 +147,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 stupidity 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/__HELPERS/game.dm b/code/__HELPERS/game.dm index 7f5035347c..170d93c31f 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -183,7 +183,7 @@ return -// Better recursive loop, technically sort of not actually recursive cause that shit is retarded, enjoy. +// Better recursive loop, technically sort of not actually recursive cause that shit is stupid, enjoy. //No need for a recursive limit either /proc/recursive_mob_check(atom/O,client_check=1,sight_check=1,include_radio=1) diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 71a5bcb99e..e769f466b9 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 mental hysteria, 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 c006f97bff..c3d0deeac6 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -19,7 +19,7 @@ integrity_modifier = 0.1 sheet_type = /obj/item/stack/sheet/glass value_per_unit = 0.0025 - 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) // yeah ok /* 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 56ce3533fc..8d57f3d9c2 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -79,7 +79,7 @@ message = " [message] " //Time for a friendly game of SS13 message = replacetext(message," stupid "," smart ") - message = replacetext(message," retard "," genius ") + message = replacetext(message," idiot "," genius ") message = replacetext(message," unrobust "," robust ") message = replacetext(message," dumb "," smart ") message = replacetext(message," awful "," great ") @@ -263,7 +263,7 @@ message = replacetext(message," thank you "," 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," dumbass "," square ") message = replacetext(message," muh valids "," getting my kicks ") speech_args[SPEECH_MESSAGE] = trim(message) diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm index 3c1364dfdd..35a944c965 100644 --- a/code/game/machinery/doors/checkForMultipleDoors.dm +++ b/code/game/machinery/doors/checkForMultipleDoors.dm @@ -12,5 +12,5 @@ for(var/obj/machinery/door/D in locate(src.x,src.y,src.z)) if(!istype(D, /obj/machinery/door/window) && D.density) return 0 - //There are no false wall checks because that would be fucking retarded + //There are no false wall checks because that would be fucking return 1 \ No newline at end of file diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 210c3d0da0..6c01e68a48 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -172,7 +172,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 meatball, 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 a67757a535..515c39ffcb 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -953,7 +953,7 @@ /obj/item/reagent_containers/food/snacks/grown/corn, /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet, /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, - /obj/item/reagent_containers/food/snacks/faggot, + /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/grown/citrus/orange, /obj/item/reagent_containers/food/snacks/grown/citrus/lemon, /obj/item/reagent_containers/food/snacks/grown/citrus/lime, @@ -1005,7 +1005,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 @@ -1028,7 +1028,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" @@ -1084,7 +1084,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 8a20456911..78c88cd09d 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 stupid. Beneath the image, someone has scratched the word \"PACKETS\"." icon_state = "kiddieplaque" /obj/structure/sign/plaques/kiddie/badger @@ -46,4 +46,3 @@ name = "Mr. Deempisi portrait" desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'" icon_state = "monkey_painting" - \ No newline at end of file diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 255b1a10fa..c70db70ee8 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -61,7 +61,7 @@ Summon Events (Toggle)
There can only be one!
There can only be one! (40-second delay)
- Make all players retarded
+ Make all players stupid
Egalitarian Station Mode
Break all lights
Fix all lights
@@ -452,14 +452,14 @@ var/datum/round_event/disease_outbreak/DO = E DO.virus_type = virus - if("retardify") + if("stupify") 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.") H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60, 80) - message_admins("[key_name_admin(usr)] made everybody retarded") + message_admins("[key_name_admin(usr)] made everybody stupid") if("eagles")//SCRAW if(!check_rights(R_FUN)) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 93b34f4522..8a7092d8a6 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -30,7 +30,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/attack_self(mob/user) on = !on - user.update_inv_head() //so our mob-overlays update + update_icon() //the mob overlay update is already done by the update_icon_updates_onmob element. if(on) set_light(brightness_on) else diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index d02ad0f1a0..7e831b6cd6 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -132,10 +132,10 @@ tastes = list("meat" = 1, "salmon" = 1) foodtype = MEAT | ALCOHOL -/obj/item/reagent_containers/food/snacks/faggot - name = "faggot" - desc = "A great meal all round. Not a cord of wood." - icon_state = "faggot" +/obj/item/reagent_containers/food/snacks/meatball + name = "meatball" + desc = "MAMA MIA DAS A SPICY" + 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 fbd3f57323..1e3afd1cf5 100644 --- a/code/modules/food_and_drinks/recipes/processor_recipes.dm +++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm @@ -6,7 +6,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_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm index 108307119d..e8640886c2 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm @@ -67,7 +67,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_EGG \ No newline at end of file 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 efb773159d..e7fdeffe14 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -129,7 +129,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 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 385d7fa359..689345b04f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -37,7 +37,7 @@ name = "Raw Khinkali" reqs = list( /obj/item/reagent_containers/food/snacks/doughslice = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, /obj/item/reagent_containers/food/snacks/grown/garlic = 1 ) result = /obj/item/reagent_containers/food/snacks/rawkhinkali @@ -48,7 +48,7 @@ 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_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 8a393476a2..6c418ab612 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -177,7 +177,7 @@ name = "Donkpocket" 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 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 21112a4a4f..a07815a030 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -71,7 +71,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 4c942a0c2d..90036c0e2a 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -80,7 +80,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 ac49537adf..ae8bd6a49c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -104,7 +104,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 12020a6241..722d91e86c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm @@ -15,7 +15,7 @@ name = "Spaghetti meatball" reqs = list( /obj/item/reagent_containers/food/snacks/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/meatballspaghetti subcategory = CAT_SPAGHETTI @@ -24,7 +24,7 @@ name = "Spesslaw" reqs = list( /obj/item/reagent_containers/food/snacks/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/spesslaw subcategory = CAT_SPAGHETTI diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 4aed218cf9..cf9c5a6a3c 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -73,7 +73,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 dumb 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 1de896520d..d4530acd04 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 100% stupid 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/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm index b0ed2000a6..3497bff09f 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm @@ -285,7 +285,7 @@ name = "Flat Top (Big)" icon_state = "hair_bigflattop" -/datum/sprite_accessory/hair/fag //grimacing emoji +/datum/sprite_accessory/hair/flow name = "Flow Hair" icon_state = "hair_f" @@ -777,4 +777,4 @@ /datum/sprite_accessory/hair/ziegler name = "Ziegler" - icon_state = "hair_ziegler" \ No newline at end of file + icon_state = "hair_ziegler" diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm index ca62df0b57..9563959ebc 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm @@ -53,7 +53,7 @@ /mob/living/carbon/alien/humanoid/update_transform() //The old method of updating lying/standing was update_icons(). Aliens still expect that. if(lying > 0) - lying = 90 //Anything else looks retarded + lying = 90 //Anything else looks silly ..() update_icons() @@ -95,4 +95,4 @@ hands += mutable_appearance(alt_inhands_file, "[itm_state][caste]_r", -HANDS_LAYER) overlays_standing[HANDS_LAYER] = hands - apply_overlay(HANDS_LAYER) \ No newline at end of file + apply_overlay(HANDS_LAYER) diff --git a/config/mentors.txt b/config/mentors.txt index 8c2bc2f392..1247986f82 100644 --- a/config/mentors.txt +++ b/config/mentors.txt @@ -1 +1 @@ -thatfaggotgeorgemellons \ No newline at end of file +thattraitorgeorgemellons diff --git a/html/archivedchangelog.html b/html/archivedchangelog.html index 6b0fb6c6e6..b586ae9d51 100644 --- a/html/archivedchangelog.html +++ b/html/archivedchangelog.html @@ -6394,7 +6394,7 @@ start of their shift. \ No newline at end of file + diff --git a/html/changelogs/AutoChangeLog-pr-11799.yml b/html/changelogs/AutoChangeLog-pr-11799.yml new file mode 100644 index 0000000000..73df4c38f9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11799.yml @@ -0,0 +1,4 @@ +author: "ForrestWick" +delete-after: True +changes: + - tweak: "changed a certain item to be called meatball, ended racism, thank you obama" diff --git a/html/changelogs/AutoChangeLog-pr-11855.yml b/html/changelogs/AutoChangeLog-pr-11855.yml new file mode 100644 index 0000000000..ca82717695 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11855.yml @@ -0,0 +1,4 @@ +author: "Linzolle" +delete-after: True +changes: + - tweak: "remove any slurs, etc. to comply with GitHub's ToS" diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 37173beadb..f5e2dc5692 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/strings/insult.json b/strings/insult.json index 77b176be8f..7c8845255a 100644 --- a/strings/insult.json +++ b/strings/insult.json @@ -81,7 +81,6 @@ "nouns_generic": [ "you", - "that faggot traitor", "you there", "guy", "person", diff --git a/strings/ion_laws.json b/strings/ion_laws.json index 55913dc3f4..b95a933d7a 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -766,7 +766,7 @@ "THIRTEEN SEQUELS", "THREE WISHES", "A SITCOM", - "THAT GRIEFING FAGGOT GEORGE MELONS", + "THAT GRIEFING 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 01259acf8c..e689727228 100644 --- a/strings/names/death_commando.txt +++ b/strings/names/death_commando.txt @@ -61,10 +61,10 @@ Splint Chesthair Stabby McGee Stump Beefgnaw Stump Chunkman -THAT DAMN FAGGOT TRAITOR GEORGE MELONS +THAT DAMN TRAITOR GEORGE MELONS Theodore Pain Thick McRunfast Toolboxl Rose Touch Rustrod Trunk Slamchest -Zombie Gandhi \ No newline at end of file +Zombie Gandhi diff --git a/strings/traumas.json b/strings/traumas.json index 864ae9b767..8d1e9537ef 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>", @@ -156,11 +156,6 @@ "mwrlins" ], - "faggot_traitor": [ - "", - "that faggot traitor" - ], - "random_gibberish": [ "g", "squid",