From f2ec2d5d66567526c41338030be8c09da9269a70 Mon Sep 17 00:00:00 2001 From: Benjamin Read Date: Fri, 15 Mar 2013 10:39:57 +1100 Subject: [PATCH 1/3] *Unbuggered the buggered up code. I swear, I'll get better at this. It works now. --- .../reagent_containers/food/snacks.dm | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index ef55c3e5b59..e23dabd2d3c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -235,10 +235,10 @@ name = "\improper Aesir salad" desc = "Probably too incredible for mortal men to fully enjoy." icon_state = "aesirsalad" - eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp") reagents.add_reagent("nutriment", 8) reagents.add_reagent("tricordrazine", 8) bitesize = 3 @@ -524,9 +524,9 @@ name = "carp fillet" desc = "A fillet of spess carp meat" icon_state = "fishfillet" - eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp") New() ..() + eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp") reagents.add_reagent("nutriment", 3) reagents.add_reagent("carpotoxin", 3) bitesize = 6 @@ -592,9 +592,9 @@ name = "sausage" desc = "A piece of mixed, long meat." icon_state = "sausage" - eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") New() ..() + eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") reagents.add_reagent("nutriment", 6) bitesize = 2 @@ -943,11 +943,11 @@ name = "popcorn" desc = "Now let's find some cinema." icon_state = "popcorn" - eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp") trash = /obj/item/trash/popcorn var/unpopped = 0 New() ..() + eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp") unpopped = rand(1,10) reagents.add_reagent("nutriment", 2) bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 @@ -1069,9 +1069,9 @@ name = "burned mess" desc = "Someone should be demoted from chef for this." icon_state = "badrecipe" - eatverb = pick("choke down","nibble","gnaw","chomp") New() ..() + eatverb = pick("choke down","nibble","gnaw","chomp") reagents.add_reagent("toxin", 1) reagents.add_reagent("carbon", 3) bitesize = 2 @@ -1126,10 +1126,10 @@ name = "meatball soup" desc = "You've got balls kid, BALLS!" icon_state = "meatballsoup" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 8) reagents.add_reagent("water", 5) bitesize = 5 @@ -1138,9 +1138,9 @@ name = "slime soup" desc = "If no water is available, you may substitute tears." icon_state = "slimesoup" - eatverb = pick("slurp","sip","suck","inhale","drink") New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("slimejelly", 5) reagents.add_reagent("water", 10) bitesize = 5 @@ -1149,9 +1149,9 @@ name = "tomato soup" desc = "Smells like copper" icon_state = "tomatosoup" - eatverb = pick("slurp","sip","suck","inhale","drink") New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 2) reagents.add_reagent("blood", 10) reagents.add_reagent("water", 5) @@ -1161,9 +1161,9 @@ name = "clown's tears" desc = "Not very funny." icon_state = "clownstears" - eatverb = pick("slurp","sip","suck","inhale","drink") New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 4) reagents.add_reagent("banana", 5) reagents.add_reagent("water", 10) @@ -1173,10 +1173,10 @@ name = "vegetable soup" desc = "A true vegan meal" //TODO icon_state = "vegetablesoup" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 8) reagents.add_reagent("water", 5) bitesize = 5 @@ -1185,10 +1185,10 @@ name = "nettle soup" desc = "To think, the botanist would've beat you to death with one of these." icon_state = "nettlesoup" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 8) reagents.add_reagent("water", 5) reagents.add_reagent("tricordrazine", 5) @@ -1198,10 +1198,10 @@ name = "mystery soup" desc = "The mystery is, why aren't you eating it?" icon_state = "mysterysoup" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10) switch(mysteryselect) if(1) @@ -1244,10 +1244,10 @@ name = "wish soup" desc = "I wish this was soup." icon_state = "wishsoup" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("water", 10) bitesize = 5 if(prob(25)) @@ -1258,10 +1258,10 @@ name = "hot chili" desc = "A five alarm Texan Chili!" icon_state = "hotchili" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 6) reagents.add_reagent("capsaicin", 3) reagents.add_reagent("tomatojuice", 2) @@ -1272,10 +1272,10 @@ name = "cold chili" desc = "This slush is barely a liquid!" icon_state = "coldchili" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 6) reagents.add_reagent("frostoil", 3) reagents.add_reagent("tomatojuice", 2) @@ -1437,10 +1437,10 @@ name = "tomato soup" desc = "Drinking this feels like being a vampire! A tomato vampire..." icon_state = "tomatosoup" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 5) reagents.add_reagent("tomatojuice", 10) bitesize = 3 @@ -1460,9 +1460,9 @@ name = "stew" desc = "A nice and warm stew. Healthy and strong." icon_state = "stew" - eatverb = pick("slurp","sip","suck","inhale","drink") New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 10) reagents.add_reagent("tomatojuice", 5) reagents.add_reagent("imidazoline", 5) @@ -1512,10 +1512,10 @@ name = "milosoup" desc = "The universes best soup! Yum!!!" icon_state = "milosoup" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 8) reagents.add_reagent("water", 5) bitesize = 4 @@ -1524,10 +1524,10 @@ name = "stewed soy meat" desc = "Even non-vegetarians will LOVE this!" icon_state = "stewedsoymeat" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/plate New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 8) bitesize = 2 @@ -1670,10 +1670,10 @@ name = "chantrelle soup" desc = "A delicious and hearty mushroom soup." icon_state = "mushroomsoup" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 8) bitesize = 3 @@ -1707,10 +1707,10 @@ name = "beet soup" desc = "Wait, how do you spell it again..?" icon_state = "beetsoup" - eatverb = pick("slurp","sip","suck","inhale","drink") trash = /obj/item/trash/snack_bowl New() ..() + eatverb = pick("slurp","sip","suck","inhale","drink") name = pick("borsch","bortsch","borstch","borsh","borshch","borscht") reagents.add_reagent("nutriment", 8) bitesize = 2 From dcfa1fcfabf0a740d425c309d975f2834667e343 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Fri, 15 Mar 2013 06:08:48 -0300 Subject: [PATCH 2/3] Fixed items not appearing on the HUD if they are given to a mob by another player with the strip panel. This should also swap under the carpet (kinda ugh because the problem is still there and it might affect some other things) the problems with the roundstart problems with player's icons on high populated servers. This should be the first step to reduce the amount of calls on the different icon update procs, but for the moment I'm focusing on more CPU expensive procs. --- .../mob/living/carbon/human/update_icons.dm | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index ebd7d3127fc..870bbafe1b9 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -399,6 +399,7 @@ Please contact me on #coderbus IRC. ~Carn x if(w_uniform && istype(w_uniform, /obj/item/clothing/under) ) if(hud_used && hud_used.hud_shown && hud_used.inventory_shown) w_uniform.screen_loc = ui_iclothing + client.screen += w_uniform overlays -= overlays_lying[UNIFORM_LAYER] overlays -= overlays_standing[UNIFORM_LAYER] var/t_color = w_uniform.color @@ -456,6 +457,7 @@ Please contact me on #coderbus IRC. ~Carn x if(wear_id) if(hud_used && hud_used.hud_shown) wear_id.screen_loc = ui_id //TODO + client.screen += wear_id overlays -= overlays_lying[ID_LAYER] overlays -= overlays_standing[ID_LAYER] overlays_lying[ID_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "id2", "layer" = -ID_LAYER) @@ -475,6 +477,7 @@ Please contact me on #coderbus IRC. ~Carn x if(gloves) if(hud_used && hud_used.hud_shown && hud_used.inventory_shown) gloves.screen_loc = ui_gloves + client.screen += gloves overlays -= overlays_lying[GLOVES_LAYER] overlays -= overlays_standing[GLOVES_LAYER] var/t_state = gloves.item_state @@ -506,6 +509,7 @@ Please contact me on #coderbus IRC. ~Carn x if(glasses) if(hud_used && hud_used.hud_shown && hud_used.inventory_shown) glasses.screen_loc = ui_glasses + client.screen += glasses overlays -= overlays_lying[GLASSES_LAYER] overlays -= overlays_standing[GLASSES_LAYER] overlays_lying[GLASSES_LAYER] = image("icon" = 'icons/mob/eyes.dmi', "icon_state" = "[glasses.icon_state]2", "layer" = -GLASSES_LAYER) @@ -525,6 +529,7 @@ Please contact me on #coderbus IRC. ~Carn x if(ears) if(hud_used && hud_used.hud_shown && hud_used.inventory_shown) ears.screen_loc = ui_ears + client.screen += ears overlays -= overlays_lying[EARS_LAYER] overlays -= overlays_standing[EARS_LAYER] overlays_lying[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[ears.icon_state]2", "layer" = -EARS_LAYER) @@ -544,6 +549,7 @@ Please contact me on #coderbus IRC. ~Carn x if(shoes) if(hud_used && hud_used.hud_shown && hud_used.inventory_shown) shoes.screen_loc = ui_shoes + client.screen += shoes var/image/lying = image("icon" = 'icons/mob/feet.dmi', "icon_state" = "[shoes.icon_state]2", "layer" = -SHOES_LAYER) var/image/standing = image("icon" = 'icons/mob/feet.dmi', "icon_state" = "[shoes.icon_state]", "layer" = -SHOES_LAYER) if(shoes.blood_DNA) @@ -568,6 +574,7 @@ Please contact me on #coderbus IRC. ~Carn x if(s_store) if(hud_used && hud_used.hud_shown) s_store.screen_loc = ui_sstore1 //TODO + client.screen += s_store overlays -= overlays_lying[SUIT_STORE_LAYER] overlays -= overlays_standing[SUIT_STORE_LAYER] var/t_state = s_store.item_state @@ -590,6 +597,7 @@ Please contact me on #coderbus IRC. ~Carn x if(head) if(hud_used && hud_used.hud_shown && hud_used.inventory_shown) head.screen_loc = ui_head //TODO + client.screen += head overlays -= overlays_lying[HEAD_LAYER] overlays -= overlays_standing[HEAD_LAYER] var/image/lying @@ -620,6 +628,7 @@ Please contact me on #coderbus IRC. ~Carn x if(belt) if(hud_used && hud_used.hud_shown) belt.screen_loc = ui_belt //TODO + client.screen += belt overlays -= overlays_lying[BELT_LAYER] overlays -= overlays_standing[BELT_LAYER] var/t_state = belt.item_state @@ -642,6 +651,7 @@ Please contact me on #coderbus IRC. ~Carn x if( wear_suit && istype(wear_suit, /obj/item/clothing/suit) ) //TODO check this if(hud_used && hud_used.hud_shown && hud_used.inventory_shown) wear_suit.screen_loc = ui_oclothing //TODO + client.screen += wear_suit overlays -= overlays_lying[SUIT_LAYER] overlays -= overlays_standing[SUIT_LAYER] var/image/lying = image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]2", "layer" = -SUIT_LAYER) @@ -685,8 +695,14 @@ Please contact me on #coderbus IRC. ~Carn x if(update_icons) update_icons() /mob/living/carbon/human/update_inv_pockets(var/update_icons=1) - if(l_store) l_store.screen_loc = ui_storage1 //TODO - if(r_store) r_store.screen_loc = ui_storage2 //TODO + if(l_store) + if(hud_used && hud_used.hud_shown) + l_store.screen_loc = ui_storage1 //TODO + client.screen += l_store + if(r_store) + if(hud_used && hud_used.hud_shown) + r_store.screen_loc = ui_storage2 //TODO + client.screen += r_store if(update_icons) update_icons() @@ -694,6 +710,7 @@ Please contact me on #coderbus IRC. ~Carn x if( wear_mask && istype(wear_mask, /obj/item/clothing/mask) ) if(hud_used && hud_used.hud_shown && hud_used.inventory_shown) wear_mask.screen_loc = ui_mask //TODO + client.screen += wear_mask overlays -= overlays_lying[FACEMASK_LAYER] overlays -= overlays_standing[FACEMASK_LAYER] var/image/lying = image("icon" = 'icons/mob/mask.dmi', "icon_state" = "[wear_mask.icon_state]2", "layer" = -FACEMASK_LAYER) @@ -719,6 +736,7 @@ Please contact me on #coderbus IRC. ~Carn x if(back) if(hud_used && hud_used.hud_shown) back.screen_loc = ui_back //TODO + client.screen += back overlays -= overlays_lying[BACK_LAYER] overlays -= overlays_standing[BACK_LAYER] overlays_lying[BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]2", "layer" = -BACK_LAYER) @@ -796,6 +814,7 @@ Please contact me on #coderbus IRC. ~Carn x /mob/living/carbon/human/update_inv_r_hand(var/update_icons=1) if(r_hand) r_hand.screen_loc = ui_rhand //TODO + client.screen += r_hand var/t_state = r_hand.item_state if(!t_state) t_state = r_hand.icon_state overlays -= overlays_standing[R_HAND_LAYER] @@ -810,6 +829,7 @@ Please contact me on #coderbus IRC. ~Carn x /mob/living/carbon/human/update_inv_l_hand(var/update_icons=1) if(l_hand) l_hand.screen_loc = ui_lhand //TODO + client.screen += l_hand var/t_state = l_hand.item_state if(!t_state) t_state = l_hand.icon_state overlays -= overlays_standing[L_HAND_LAYER] From eeb0e1dbe34651f6aef8b59183ac7e9ad2eeec50 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Fri, 15 Mar 2013 06:39:46 -0300 Subject: [PATCH 3/3] Same change here, but with monkeys. --- code/modules/mob/living/carbon/monkey/update_icons.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm index eac1d124812..05be068b3e0 100644 --- a/code/modules/mob/living/carbon/monkey/update_icons.dm +++ b/code/modules/mob/living/carbon/monkey/update_icons.dm @@ -41,6 +41,8 @@ /mob/living/carbon/monkey/update_inv_wear_mask(var/update_icons=1) if( wear_mask && istype(wear_mask, /obj/item/clothing/mask) ) wear_mask.screen_loc = ui_monkey_mask + if(hud_used) + client.screen += wear_mask overlays -= overlays_lying[M_MASK_LAYER] overlays -= overlays_standing[M_MASK_LAYER] var/image/lying = image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "[wear_mask.icon_state]2", "layer" = -M_MASK_LAYER) @@ -65,6 +67,8 @@ /mob/living/carbon/monkey/update_inv_r_hand(var/update_icons=1) if(r_hand) r_hand.screen_loc = ui_rhand + if(hud_used) + client.screen += r_hand var/t_state = r_hand.item_state if(!t_state) t_state = r_hand.icon_state overlays -= overlays_standing[M_R_HAND_LAYER] @@ -79,6 +83,8 @@ /mob/living/carbon/monkey/update_inv_l_hand(var/update_icons=1) if(l_hand) l_hand.screen_loc = ui_lhand + if(hud_used) + client.screen += l_hand var/t_state = l_hand.item_state if(!t_state) t_state = l_hand.icon_state overlays -= overlays_standing[M_L_HAND_LAYER] @@ -93,6 +99,8 @@ /mob/living/carbon/monkey/update_inv_back(var/update_icons=1) if(back) back.screen_loc = ui_monkey_back + if(hud_used) + client.screen += back overlays -= overlays_lying[M_BACK_LAYER] overlays -= overlays_standing[M_BACK_LAYER] overlays_lying[M_BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]2", "layer" = -M_BACK_LAYER)