From de8628043422bafd00b57ea5aad942bc75f0d514 Mon Sep 17 00:00:00 2001 From: Aryn Date: Thu, 20 Mar 2014 04:48:08 -0600 Subject: [PATCH] Ctrl-H "faggot" to "meatball" and one icon state change. --- .../Cael_Aislinn/Jungle/jungle_temple.dm | 2 +- code/game/machinery/kitchen/processor.dm | 8 +++--- .../items/weapons/grenades/spawnergrenade.dm | 2 +- code/modules/food/recipes_microwave.dm | 26 +++++++++--------- code/modules/mob/living/carbon/human/life.dm | 12 ++++---- code/modules/reagents/Chemistry-Recipes.dm | 2 +- .../reagent_containers/food/snacks.dm | 12 ++++---- icons/obj/food.dmi | Bin 92119 -> 92113 bytes 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm index 20009c0a64..3581c9fff6 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm @@ -210,7 +210,7 @@ /obj/item/weapon/reagent_containers/food/snacks/candiedapple, \ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, \ /obj/item/weapon/reagent_containers/food/snacks/cookie, \ - /obj/item/weapon/reagent_containers/food/snacks/faggot, \ + /obj/item/weapon/reagent_containers/food/snacks/meatball, \ /obj/item/weapon/reagent_containers/food/snacks/plump_pie, \ ) for(var/i=0,i", "I WANNA PET TEH monkeyS", "stop grifing me!!!!", "SOTP IT#")) + say(pick("IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "CAPTAINS A COMDOM", "[pick("", "that meatball traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!", "can u give me [pick("telikesis","halk","eppilapse")]?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", "I WANNA PET TEH monkeyS", "stop grifing me!!!!", "SOTP IT#")) if(2) say(pick("FUS RO DAH","fucking 4rries!", "stat me", ">my face", "roll it easy!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom", "PACKETS!!!")) if(3) @@ -1587,7 +1587,7 @@ else if(status_flags & XENO_HOST) holder.icon_state = "hudxeno" holder2.icon_state = "hudxeno" - else if(foundVirus) + else if(foundVirus) holder.icon_state = "hudill" else if(has_brain_worms()) var/mob/living/simple_animal/borer/B = has_brain_worms() @@ -1628,7 +1628,7 @@ var/obj/item/weapon/card/id/I = wear_id.GetID() if(I) perpname = I.registered_name - + for(var/datum/data/record/E in data_core.general) if(E.fields["name"] == perpname) for (var/datum/data/record/R in data_core.security) @@ -1649,7 +1649,7 @@ if(hud_updateflag & 1 << IMPLOYAL_HUD || hud_updateflag & 1 << IMPCHEM_HUD || hud_updateflag & 1 << IMPTRACK_HUD) var/image/holder1 = hud_list[IMPTRACK_HUD] var/image/holder2 = hud_list[IMPLOYAL_HUD] - var/image/holder3 = hud_list[IMPCHEM_HUD] + var/image/holder3 = hud_list[IMPCHEM_HUD] holder1.icon_state = "hudblank" holder2.icon_state = "hudblank" @@ -1672,7 +1672,7 @@ var/image/holder = hud_list[SPECIALROLE_HUD] holder.icon_state = "hudblank" if(mind) - + switch(mind.special_role) if("traitor","Syndicate") holder.icon_state = "hudsyndicate" @@ -1690,7 +1690,7 @@ holder.icon_state = "huddeathsquad" if("Ninja") holder.icon_state = "hudninja" - + hud_list[SPECIALROLE_HUD] = holder hud_updateflag = 0 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 06ebdc6c9a..8e8fb91710 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -851,7 +851,7 @@ datum var/list/flashers = list() for(var/mob/living/carbon/human/M in viewers(TO, null)) if(M:eyecheck() <= 0) - flick("e_flash", M.flash) // flash dose faggots + flick("e_flash", M.flash) flashers += M var/y_distance = TO.y - FROM.y diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 0a1f2fbafc..3e99d56b25 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -670,10 +670,10 @@ reagents.add_reagent("nutriment", 3) src.bitesize = 6 -/obj/item/weapon/reagent_containers/food/snacks/faggot - name = "Faggot" - desc = "A great meal all round. Not a cord of wood." - icon_state = "faggot" +/obj/item/weapon/reagent_containers/food/snacks/meatball + name = "meatball" + desc = "A great meal all round." + icon_state = "meatball" filling_color = "#DB0000" New() @@ -2837,7 +2837,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun/attackby(obj/item/weapon/W as obj, mob/user as mob) // Bun + meatball = burger - if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/faggot)) + if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/meatball)) new /obj/item/weapon/reagent_containers/food/snacks/monkeyburger(src) user << "You make a burger." del(W) @@ -2908,7 +2908,7 @@ ..() reagents.add_reagent("nutriment", 2) -/obj/item/weapon/reagent_containers/food/snacks/rawfaggot +/obj/item/weapon/reagent_containers/food/snacks/rawmeatball name = "raw meatball" desc = "A raw meatball." icon = 'icons/obj/food_ingredients.dmi' diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 54610e3fe68bc435d84bcefbfd0d1eb0a01a039c..4866a35ec03433056ed82aff2ab6194646db3450 100644 GIT binary patch delta 1479 zcmV;&1vvWG&jr!X1&}0vp?XwUbVOxyV{&P5bZKvH004NLm72?L9XAYy*FH~il5Cs8 zxioDT-n0pdph)rv2ONnrqDK-1T|A!i^j(bS*i8`VH@vZdPaI03s9&UC9sm0D&*!hl zk6%6??l>3Gc)U5j|MmKCwTP|mcyoOB_HgA`CRevVN~Oxjo8!xWg~riyd3m_9lFRYt z_~vjmW(vIhe&LF)o?|^tnK^c8H?%x)?s7vWi6Cn=w)&=v-GZFe*y>x*T%QX}bs+D% zpmCD=%WWvywf|9#Gq0u%Jm~#1=p|En2Hr)pf_pf6ZGDQT31MERmXq&$$J6wB@C^eq zTZq$4al%Zl?7c335Q?2Ho~GBCBo3g}AffN6)i@_LGgs{B40`_oCa=5XB5@iiPR2E4 zPJ`b626FvWuyOq}zH#qB?mg-s>R^AlH|}?k`vc_uL?_bU}Q54RX)+f&=%DdRwR&Aj8Ff^9rOFrxmj|b2Y9d_5D2j zfOffi@OG-1fIGL1qx5rh(G{C-AzzE5nR5w~tdG1f_ebiGXDG~uS zn8@&{E)r(}rnp8cCqpx!Gu6u-s~|dxxd@+}#+fsys7^+6fA5UfrK3u(ylVPxR2wK7 z%7C(xz+gy!8pmAN(A-~TuVmQ{G_y@wsVbyd6R>|8*mJFY5HV&P=e#0h@+1+Ox}lu4 zLg+n5Md$r!_Efw8XZhkW$Up8bI3O_9Av5)JW7V-?e-$2Y(H@bhSn0!68G%ijM)1Ach4^xO5LiR;5v=0&3Y;WVW+ zWv*u=2dlTni5KL3fPs6Vttg=UBiHH~LKi6x0xx?C(E}Onr=H|nNGC*-JZvY#4on%k zHA-Udw`_{MyPn{EA7mP&qH>p`apK8RLHu}sr2B!GnZl+BFzxdF05Jb(oP~>JFO#dt z9JVU!J^~1*sXRVw``+a5lc9tz^IDJ3eEwk1F$8-B@u z6kV+XBB&&qxYqs^vx9?*2igIb8ws{wd0|_0#gcQIsGm703|WiNUGo!VDJHk#0OuE~ zoCAA};L&S|^D{EKp=gCIC8SeBDS3u&!IV5!6}gb;i(HL*syqN|Zq#UB1G+Zxt~AkC zS)hu&_iowy6;436?EMOETuEGtr+!|4xhxr0s(DI-RSz!#H12hYr7{8az^#FYRn|Bt zR*2d?1t<3C1G*BsCm^3SW660-by>3-%|L`Mie2jazYTyr&>_PmzdeqSW^tib2q*(> z6`nXD_2jUY%6WxWcg(^TaWn|f%bA>(iq<|_NV7z!+7+P`tt9M|okkP-tef#(Grx!0?^tXdj@?0tRr{y>gg*h>K(ly(2Fc zLzA4(1hp4;@)Wp~e(&glYXbg%VW;~&)}8EkPIt23jlK9UZYdnP7E-eoc?wlE9b2Bc9{{DcaYQUy(MTD3g;X;Am%_sn9m|GJtJR&N5AFP{(p0VO%8JIkb~3(x6}mz17gHn*nI#1 delta 1485 zcmV;;1v2{4&jr`d1&}0vr+QRabVOxyV{&P5bZKvH004NLm72|NBR34k&&gAG+iSPT ze)Q{*OS_9=QM7#ogClW9iX~B?s7xkL--9zw+G3%9kc$KSM3WRnQKY{;{QCL#FMl0A z{rTnkp0!0Ohug!)?{BWJ*61x9ZVw;cUta}|OR)1l&B*w0d-!I5rFl-=zPY~gQQP76 z@b3C*R?2+-eBqjGiHjWHV{WEp5gTGI z#5#7iqvE$Am8G0`bA94T9$rDOO7#`^5LE$pa8A<46fX3* ziBefGksGHZD}-WyXN#BRtx_x#C^g4C*3?TmRdFXChp?B@ZIXu{Ve)23uCXjLmBodQ z*fhz*4p4?FF0`jNb-%k12SBHdE9{X62vfhCpH&)l{C)7 zPw0?)0B|>FmQf#pR zwO}R3M_Xe#MZm&|caLE7M1=}r?1?6sFehxY zMj$(!9kvE$FhTIj9w^gI=5g6M#}?+85>O#$rZJ>{V#WnR_dUV`1dFFjlwkM+7kLH# zB37^kb8Kkez+~d$}Uzc zZ!|;lV~vlGlu4Js8jW7d<7uqM$H%ew3keGDEvQHag}k2_@4oxr-?KQ%RHD%xr}UK?@W*FKKioWvxVgSkUSsk9 zJ56<~%JzulU`gJEm?H8%z`)F86Q$GysQe3?C5F&7wg7>bJ%#9roQzXXO+D8mQj}Yw4pN3iQ&u;RsZuk4 zI=cWV+3-uI$>s$pf?B18&Bj;E4o(siFb=rfNU(h4m3@;9OU`|vapt5vskBJ02|Pk_&zI2qS~ zp)b5wn&_)6lVR_@J5FhX6VM%}w1FFc*DAM`Xq;CrF2hidrdz!~VIaLaFxBV<_I zs5b)IK<5rmS&)8m-kPy)kauT|>=8wC1ZFu)kY;G_qvv{x1!}imP_(Lh+AFYsHySwQ zDK^(5(8k*HCE{HdXr+>S3*)PIVm3(VZ-4*&$CuA<-nwf@oY^VhXa^JUu&IPy51pxzMMxxLL