From d8b3888b02612c8c3ef1723b3f6cd6d86cd2aa6f Mon Sep 17 00:00:00 2001 From: Cydia Date: Tue, 4 Aug 2020 00:13:46 -0500 Subject: [PATCH] Removes slurs from the code/Changes the meatball name I feel like this was long overdue, especially for github TOS. --- _maps/RandomRuins/SpaceRuins/bus.dmm | 18 +++++++++--------- code/game/objects/items/manuals.dm | 2 +- code/game/objects/items/storage/boxes.dm | 6 +++--- .../food_and_drinks/food/snacks_meat.dm | 8 ++++---- .../recipes/processor_recipes.dm | 2 +- .../recipes/tablecraft/recipes_meat.dm | 4 ++-- .../recipes/tablecraft/recipes_pastry.dm | 4 ++-- .../recipes/tablecraft/recipes_pizza.dm | 2 +- .../recipes/tablecraft/recipes_salad.dm | 2 +- .../recipes/tablecraft/recipes_soup.dm | 2 +- .../recipes/tablecraft/recipes_spaghetti.dm | 4 ++-- code/modules/holiday/easter.dm | 2 +- config/mentors.txt | 2 +- icons/emoji.dmi | Bin 41183 -> 41183 bytes icons/obj/food/food.dmi | Bin 62098 -> 62099 bytes strings/insult.json | 1 - strings/ion_laws.json | 2 +- strings/names/death_commando.txt | 2 +- 18 files changed, 31 insertions(+), 32 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index c731bcac..2f5c1419 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/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 8706870b..978f0c05 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -169,7 +169,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 b6cae9e2..e79d807a 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -963,7 +963,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 @@ -986,7 +986,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" @@ -1042,7 +1042,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/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index cf99bd78..4e62d756 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 = "A ball of meat." + icon_state = "meatball" list_reagents = list("nutriment" = 4, "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 1da81b99..1d8bd7b0 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_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index d352ffe1..34ece124 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -95,7 +95,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 @@ -114,7 +114,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 365cf499..b9941852 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -144,7 +144,7 @@ datum/crafting_recipe/food/donut/meat 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 @@ -210,7 +210,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 64447dd1..67a20695 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 39eeb7d9..920691bc 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 a6dc350b..ccbbe71c 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 35540211..08b4ce80 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/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 @@ -33,7 +33,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/holiday/easter.dm b/code/modules/holiday/easter.dm index 829cb553..d6d4ed2a 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -195,7 +195,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 category = CAT_MISCFOOD diff --git a/config/mentors.txt b/config/mentors.txt index 8c2bc2f3..7ad06f7e 100644 --- a/config/mentors.txt +++ b/config/mentors.txt @@ -1 +1 @@ -thatfaggotgeorgemellons \ No newline at end of file +thatgamergeorgemellons \ No newline at end of file diff --git a/icons/emoji.dmi b/icons/emoji.dmi index 925b072a5fee19248644c099bfe255d8b43c27f3..505f42fbc623c3eecf1b42608a130c8c2df827de 100644 GIT binary patch delta 801 zcmV++1K#}K!2;jG0+42Z*ozk!NYs!+j`V)`^7WtR@59r#=i`~JCe6cXc)Yzk9`+Pk z98Sai$KxS#T4MY8r#5OloQ8KzRYv{s?sy2v>TnwFkB8Z4o+D#j~(D2cRJlwgM6kNze1wbY8NvPe5rON(lm3)jbiCiLom2z>h7;2`;C%*Q= zhOIYIb1@rm(os4$%Bu^caGT)T^LAdOX5?uaTwL7qD2)aGRYd7>PDE>Pp=bCSu(Z!3ig8{)ah48pz81o(`#13k7P)WziY3QK?^Kc}<5TQCLM z@N`-IrMe$?&>eB%TvG9aDnd*5VMZxKbFxLwy!&=6vH&Mdm2C4H4pPz)S?S--z)Qx| z0W;Pp01AgVeNn%Ex0v#p07oj-pDmo15fJsp0fE(jDM7GaAQ(>wY@&^UA#d0bM(GHw zNUw1e;5JgE*LVizWF{-p0qant*GMa(_+DdreI?)pq)4w3xU5x4+m)T)jNK16AKn@c z|D9us2^bqMY=&F~fG5SG0$3%{Y4u?>^VQf7#(T=)k0L{S(`*V{iFdLMxQEQrYXsgR fuXfiH_rurkPs7u<=i`3_uwpP%SF~@la|3Lh6a$mj delta 801 zcmV++1K#}K!2;jG0+42Z$YlczXlh6fM|wYe`TEcE_u=W=^YP49ljh+xJl@_N4|@tN z4yWP%TnwFkB8Z47vEwVO6}q2Z$sdAM^iDY%e{3V=%FlTf=AOO^d-m3)jbiCiLom2z>h7;2`;C%*Q= zhQ*txxtI+&=_s8W<<$jJav@DGbyow*E)0~kCGjcSIE?C3(IN}&ek~cGET{ZJekjfB zhBR&x&J98Kyk^}q0@Ym*SV;>4%bb?zS3>j3e&hb&tUh^tL26}w;nN~|=87oM(tRq7 z&njm?ZbPd6Ox2Wsmo7dXoR{Q}Lgsza0-V&ssOA$~BL#rD(J1-E%|g}hp;@TLk+PrM z^ynwn4H!QXzln;LNr7Nvw*~19&E5ZK(A?VtuvnG_5Wtav#P*mfGQ)*gAOZB#8cF<6 zg$rVF?mvJ21S~uq{W0&^pEu2^>gI0(QxRZ%X&X&z0yay3Ul5;JFF638oydI6ko4*| zA_p};`;7zn73XCsLK&G7Kvou&L@lcL%l&_-ZzxPl1Z=U;z`6Ez!VcV#+ ztK;%`JOmcH45#7Y=IY;@vZ_t|7hCu6JKo*x{mtF&r#C65*{|T*!)y16jHZBb$QPf; zrX>RId7>PDE|Bc=Imu+?%SxfbhBz)VgK#f20WM?hfW}sYx|n>eumr55b2|H93#Nb! zPnXpX)&0DK?uZBHl8T>H5n8$rGfElSlPz-Q-8W;A1vqJ{WScKINJ~c~(!ZU7cZ{h6 zR;*C~CLH4QMScBlG37M@epITzTR1NxFw`3d1Xibi1i^ZNU_2qPi8cn7ykSQer6aH+ zy~a_1yGW5<;~ChKnXE_$tV5ArBdy59_ZrjdD*^8xMS6|ERjo?eu6+5;+Wm0z;jQ8D zUpc0jfVJ_$X2?|lcu*`VfK?KmRv%U~U(Nksyr&%gXfnh%&8EPGcqiL{d&n%kM&Kp# fs=B@tAHIHn8lJvAAO8a)Bw=O}Biz@sa|3LhBX5rX diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index acaf566806fd57c9738a6ddaed708c66f67b8202..246fae3f132954244d1b46b6b7c3868499967315 100644 GIT binary patch delta 1125 zcmV-r1e*Jj86W&@R+i4z5$Z9{GpqpT)$RwB0PgutV5)D%)*DSAPPP|0F_C%k0Ag=!Za!6{+L zeFasf)`g}}{1jp|%$x}NkV>t@CiFjIF@Yn2nn2%XO09SmNhJof*eF4@f2k-rII`(j zVVWZKce=_nMY7UGwn$tDn^S+Ijk~2tc_3Z-apyhDpb$!6gW?QGLtO(ep}!VoV;2U5 z#b68cL?zJRg%?s|OdU|PZ@4Jn$c?a&%Tl3A_lfK&rZE(3q3;`#C{nF`b4(h@S%OCj zY}rFhE?^%-Q6@JMO(uoLf2G=tET~Ggu{6&)0@npz5Jezi28-Wot8?0Y^NWmD0BlUO2 zkwlTjP>39On&(Te^>%mVD8jbC+uvOO^!aJxz-EmSW5{AK(ov#^e+zE^+ezf@_3`sv zIyJ=ZL{P_O@Nt4#D#2pONKOoOOR2PyE3z4LZ6!?4xhfn6X6*;4AFCn~ghGHkXd zmYgAgpobMWwc`8kK8e=GG@ytji~jlb>)-dEUc7kG7omU)=_T$eisT=20}9wH-w`ej zep>7{gBo8gAfXbZe*)~*fW9ACB}8&6Dky4jyciOhoDOD*luW3djNuW~na~`8tF3DF z;AFL-3q`78E8eI0i|u)Pia;N(Kb-fh)tg2~FDNL=hPLF1HRMk8f?{kmM?f)TZa`sU zav1@I`!&efkbPLi4O57wM5EHzsIX$ImS*rs4k%F+YA~3~e>nC?pub2d@6VF(o7)f9 zH*dauZ_j+qOGTAZEIF*8RP>fw`xM(6bH7>gQk_^vCDjdEMpz8485=$Ci4B$zQooT& z6on^kp^mclGhU)7yqM}RK$?{3v2U`{*g^l5yzpY-Xr5PveqA*+nq_RN!O-v_D3clX zL}jzmR*nI^e^{F@E8Iq4BYQXkFeYw+nh2tiR)JD8XyMRbH}rzyEQKGpd8RtVminVU zv85U+m?suR=YBEwO+;sHJ6rhPOK)YTKz0ZnV~z2yT<_g&-o3<-$O5OD_gWt_o%8E2aNGS1+>425bt4Rq4R zNM`)tQkj-=F9#;bInrRfqzJqX$I8?4f(tK#yQJc6if_LP6Kb?n{k13?yD%Uu z23w#fDuD(sypS4W>VTqs!$ko{ZiIzgmI_t6Ph?LqjiF!*eczBok!tOmW70s*5EZO8rsZCSp zVD2JrMvuWqG5g0+U!TQCA6pVp5Qh#S0 zNfcQOg~)-YdA{^oZ+BOYB5eD+{mu1HpPwcUY}P0-hAajn9VL3Wf8h4NokZSVA3xuv zQ$y@d1a)i%A1A1#5-gUC0p*f$%NX;7#=~L3C$6>+NxF$ zPF5SbP^2oh;(dz0*q*ni2=w9l!+FnIy=ipxf`X!KXiJ`0L+(T`D8@!}1QbK&1{5|X zml067UxSRvC;FM*kB1E^&6Q) zQFzi8>L_bJ<0Xp1i>VF+q)CY$`z9-m9rRzx3ojOq=6O}<*Hu%aS;nRs3=JQGGMQmd zR5mMZ77qP&LoX=KQuuM3XR1SNsXyuy zTdJXgd16s??iX|4M1)7semM5Rv{?e!0W^r6B?d4i;V0Hu+}Acu+D8*XT|Ge^(6sgr%xAG#R#H^5e;md_6|IIlf(qE*{S{D#9KlfZ z^dpV}4@&VA$Qk|s diff --git a/strings/insult.json b/strings/insult.json index 77b176be..7c884525 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 1c28d5d5..d473c55f 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 BASTARD 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 226b0740..027e846d 100644 --- a/strings/names/death_commando.txt +++ b/strings/names/death_commando.txt @@ -61,7 +61,7 @@ Splint Chesthair Stabby McGee Stump Beefgnaw Stump Chunkman -THAT DAMN FAGGOT TRAITOR GEORGE MELONS +THAT DAMN ASSHOLE TRAITOR GEORGE MELONS Theodore Pain Thick McRunfast Toolboxl Rose