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 54610e3fe6..4866a35ec0 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ