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 5e324fdf5f..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 [censored for github] 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 6b9b856bec..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 [censored for github], 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/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm index 20d8492d0f..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 [censored for github] + 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/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/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",