cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ctrl-H "faggot" to "meatball" and one icon state change.

Browse Source
This commit is contained in:
Aryn
2014-03-20 04:48:08 -06:00
parent 83d028e394
commit de86280434
8 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm
View File

@@ -210,7 +210,7 @@
/obj/item/weapon/reagent_containers/food/snacks/candiedapple, \ /obj/item/weapon/reagent_containers/food/snacks/candiedapple, \
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar, \ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, \
/obj/item/weapon/reagent_containers/food/snacks/cookie, \ /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, \ /obj/item/weapon/reagent_containers/food/snacks/plump_pie, \
) )
for(var/i=0,i<num,i++) for(var/i=0,i<num,i++)

8
code/game/machinery/kitchen/processor.dm
View File

@@ -27,19 +27,19 @@
/* objs */ /* objs */
meat meat
input = /obj/item/weapon/reagent_containers/food/snacks/meat input = /obj/item/weapon/reagent_containers/food/snacks/meat
output = /obj/item/weapon/reagent_containers/food/snacks/faggot output = /obj/item/weapon/reagent_containers/food/snacks/meatball
meat2 meat2
input = /obj/item/weapon/syntiflesh input = /obj/item/weapon/syntiflesh
output = /obj/item/weapon/reagent_containers/food/snacks/faggot output = /obj/item/weapon/reagent_containers/food/snacks/meatball
/* /*
monkeymeat monkeymeat
input = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey input = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey
output = /obj/item/weapon/reagent_containers/food/snacks/faggot output = /obj/item/weapon/reagent_containers/food/snacks/meatball
humanmeat humanmeat
input = /obj/item/weapon/reagent_containers/food/snacks/meat/human input = /obj/item/weapon/reagent_containers/food/snacks/meat/human
output = /obj/item/weapon/reagent_containers/food/snacks/faggot output = /obj/item/weapon/reagent_containers/food/snacks/meatball
*/ */
potato potato
input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato

2
code/game/objects/items/weapons/grenades/spawnergrenade.dm
View File

@@ -17,7 +17,7 @@
playsound(T, 'sound/effects/phasein.ogg', 100, 1) playsound(T, 'sound/effects/phasein.ogg', 100, 1)
for(var/mob/living/carbon/human/M in viewers(T, null)) for(var/mob/living/carbon/human/M in viewers(T, null))
if(M:eyecheck() <= 0) if(M:eyecheck() <= 0)
flick("e_flash", M.flash) // flash dose faggots flick("e_flash", M.flash)
for(var/i=1, i<=deliveryamt, i++) for(var/i=1, i<=deliveryamt, i++)
var/atom/movable/x = new spawner_type var/atom/movable/x = new spawner_type

26
code/modules/food/recipes_microwave.dm
View File

@@ -207,7 +207,7 @@ I said no!
/datum/recipe/donkpocket /datum/recipe/donkpocket
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/faggot /obj/item/weapon/reagent_containers/food/snacks/meatball
) )
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked) proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
@@ -619,7 +619,7 @@ I said no!
/datum/recipe/meatballsoup /datum/recipe/meatballsoup
reagents = list("water" = 10) reagents = list("water" = 10)
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/faggot , /obj/item/weapon/reagent_containers/food/snacks/meatball ,
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
/obj/item/weapon/reagent_containers/food/snacks/grown/potato, /obj/item/weapon/reagent_containers/food/snacks/grown/potato,
) )
@@ -887,8 +887,8 @@ I said no!
reagents = list("water" = 5) reagents = list("water" = 5)
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/faggot, /obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/faggot, /obj/item/weapon/reagent_containers/food/snacks/meatball,
) )
result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti
@@ -896,10 +896,10 @@ I said no!
reagents = list("water" = 5) reagents = list("water" = 5)
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/faggot, /obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/faggot, /obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/faggot, /obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/faggot, /obj/item/weapon/reagent_containers/food/snacks/meatball,
) )
result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
@@ -1084,7 +1084,7 @@ I said no!
/datum/recipe/sausage /datum/recipe/sausage
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/faggot, /obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/cutlet, /obj/item/weapon/reagent_containers/food/snacks/cutlet,
) )
result = /obj/item/weapon/reagent_containers/food/snacks/sausage result = /obj/item/weapon/reagent_containers/food/snacks/sausage
@@ -1185,7 +1185,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
/obj/item/weapon/reagent_containers/food/snacks/grown/potato, /obj/item/weapon/reagent_containers/food/snacks/grown/potato,
/obj/item/weapon/reagent_containers/food/snacks/faggot, /obj/item/weapon/reagent_containers/food/snacks/meatball,
) )
result = /obj/item/weapon/reagent_containers/food/snacks/validsalad result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
make_food(var/obj/container as obj) make_food(var/obj/container as obj)
@@ -1240,11 +1240,11 @@ I said no!
) )
result = /obj/item/weapon/reagent_containers/food/snacks/flatbread result = /obj/item/weapon/reagent_containers/food/snacks/flatbread
/datum/recipe/faggot /datum/recipe/meatball
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/rawfaggot /obj/item/weapon/reagent_containers/food/snacks/rawmeatball
) )
result = /obj/item/weapon/reagent_containers/food/snacks/faggot result = /obj/item/weapon/reagent_containers/food/snacks/meatball
/datum/recipe/cutlet /datum/recipe/cutlet
items = list( items = list(

12
code/modules/mob/living/carbon/human/life.dm
View File

@@ -182,7 +182,7 @@
if (prob(3)) if (prob(3))
switch(pick(1,2,3)) switch(pick(1,2,3))
if(1) if(1)
say(pick("IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "CAPTAINS A COMDOM", "[pick("", "that faggot 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#")) 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) 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!!!")) 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) if(3)
@@ -1587,7 +1587,7 @@
else if(status_flags & XENO_HOST) else if(status_flags & XENO_HOST)
holder.icon_state = "hudxeno" holder.icon_state = "hudxeno"
holder2.icon_state = "hudxeno" holder2.icon_state = "hudxeno"
else if(foundVirus) else if(foundVirus)
holder.icon_state = "hudill" holder.icon_state = "hudill"
else if(has_brain_worms()) else if(has_brain_worms())
var/mob/living/simple_animal/borer/B = 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() var/obj/item/weapon/card/id/I = wear_id.GetID()
if(I) if(I)
perpname = I.registered_name perpname = I.registered_name
for(var/datum/data/record/E in data_core.general) for(var/datum/data/record/E in data_core.general)
if(E.fields["name"] == perpname) if(E.fields["name"] == perpname)
for (var/datum/data/record/R in data_core.security) 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) 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/holder1 = hud_list[IMPTRACK_HUD]
var/image/holder2 = hud_list[IMPLOYAL_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" holder1.icon_state = "hudblank"
holder2.icon_state = "hudblank" holder2.icon_state = "hudblank"
@@ -1672,7 +1672,7 @@
var/image/holder = hud_list[SPECIALROLE_HUD] var/image/holder = hud_list[SPECIALROLE_HUD]
holder.icon_state = "hudblank" holder.icon_state = "hudblank"
if(mind) if(mind)
switch(mind.special_role) switch(mind.special_role)
if("traitor","Syndicate") if("traitor","Syndicate")
holder.icon_state = "hudsyndicate" holder.icon_state = "hudsyndicate"
@@ -1690,7 +1690,7 @@
holder.icon_state = "huddeathsquad" holder.icon_state = "huddeathsquad"
if("Ninja") if("Ninja")
holder.icon_state = "hudninja" holder.icon_state = "hudninja"
hud_list[SPECIALROLE_HUD] = holder hud_list[SPECIALROLE_HUD] = holder
hud_updateflag = 0 hud_updateflag = 0

2
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -851,7 +851,7 @@ datum
var/list/flashers = list() var/list/flashers = list()
for(var/mob/living/carbon/human/M in viewers(TO, null)) for(var/mob/living/carbon/human/M in viewers(TO, null))
if(M:eyecheck() <= 0) if(M:eyecheck() <= 0)
flick("e_flash", M.flash) // flash dose faggots flick("e_flash", M.flash)
flashers += M flashers += M
var/y_distance = TO.y - FROM.y var/y_distance = TO.y - FROM.y

12
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -670,10 +670,10 @@
reagents.add_reagent("nutriment", 3) reagents.add_reagent("nutriment", 3)
src.bitesize = 6 src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/faggot /obj/item/weapon/reagent_containers/food/snacks/meatball
name = "Faggot" name = "meatball"
desc = "A great meal all round. Not a cord of wood." desc = "A great meal all round."
icon_state = "faggot" icon_state = "meatball"
filling_color = "#DB0000" filling_color = "#DB0000"
New() New()
@@ -2837,7 +2837,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/reagent_containers/food/snacks/bun/attackby(obj/item/weapon/W as obj, mob/user as mob)
// Bun + meatball = burger // 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) new /obj/item/weapon/reagent_containers/food/snacks/monkeyburger(src)
user << "You make a burger." user << "You make a burger."
del(W) del(W)
@@ -2908,7 +2908,7 @@
..() ..()
reagents.add_reagent("nutriment", 2) reagents.add_reagent("nutriment", 2)
/obj/item/weapon/reagent_containers/food/snacks/rawfaggot /obj/item/weapon/reagent_containers/food/snacks/rawmeatball
name = "raw meatball" name = "raw meatball"
desc = "A raw meatball." desc = "A raw meatball."
icon = 'icons/obj/food_ingredients.dmi' icon = 'icons/obj/food_ingredients.dmi'

BIN
icons/obj/food.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 90 KiB

After

Width:  |  Height:  |  Size: 90 KiB