From 1f1fe76ec6ca79e2dfe896f68de2781499cd3e5b Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 17 Mar 2015 19:16:14 +1030 Subject: [PATCH 1/9] Fixes #8495 --- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 24 ++++++++++--------- .../living/carbon/human/species/species.dm | 1 + .../human/species/xenomorphs/alien_species.dm | 2 ++ .../mob/living/carbon/monkey/monkey.dm | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 5c047cd9dd2..ccbf129293d 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -712,7 +712,7 @@ if(species.has_fine_manipulation) return 1 if(!silent) - src << "You don't have the dexterity to use [src]!" + src << "You don't have the dexterity to use that!" return 0 /mob/living/carbon/human/abiotic(var/full_body = 0) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 5b55733a107..0bf82da6a63 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -617,7 +617,7 @@ else apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat") fire_alert = max(fire_alert, 2) - + else if(breath.temperature <= species.cold_level_1) if(breath.temperature > species.cold_level_2) apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold") @@ -705,7 +705,7 @@ //Body temperature is too hot. fire_alert = max(fire_alert, 1) if(status_flags & GODMODE) return 1 //godmode - + if(bodytemperature < species.heat_level_2) take_overall_damage(burn=HEAT_DAMAGE_LEVEL_1, used_weapon = "High Body Temperature") fire_alert = max(fire_alert, 2) @@ -719,7 +719,7 @@ else if(bodytemperature <= species.cold_level_1) fire_alert = max(fire_alert, 1) if(status_flags & GODMODE) return 1 //godmode - + if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) if(bodytemperature > species.cold_level_2) take_overall_damage(burn=COLD_DAMAGE_LEVEL_1, used_weapon = "High Body Temperature") @@ -1285,6 +1285,8 @@ glasses_processed = 1 process_glasses(glasses) + if(!glasses_processed && (species.vision_flags > 0)) + sight |= species.vision_flags if(!seer && !glasses_processed) see_invisible = SEE_INVISIBLE_LIVING @@ -1571,7 +1573,7 @@ var/percentage_health = RoundHealth((health-config.health_threshold_crit)/(maxHealth-config.health_threshold_crit)*100) holder.icon_state = "hud[percentage_health]" hud_list[HEALTH_HUD] = holder - + if (BITTEST(hud_updateflag, STATUS_HUD)) var/foundVirus = 0 for(var/datum/disease/D in viruses) @@ -1608,7 +1610,7 @@ hud_list[STATUS_HUD] = holder hud_list[STATUS_HUD_OOC] = holder2 - + if (BITTEST(hud_updateflag, ID_HUD)) var/image/holder = hud_list[ID_HUD] if(wear_id) @@ -1622,7 +1624,7 @@ hud_list[ID_HUD] = holder - + if (BITTEST(hud_updateflag, WANTED_HUD)) var/image/holder = hud_list[WANTED_HUD] holder.icon_state = "hudblank" @@ -1648,11 +1650,11 @@ holder.icon_state = "hudreleased" break hud_list[WANTED_HUD] = holder - + if ( BITTEST(hud_updateflag, IMPLOYAL_HUD) \ || BITTEST(hud_updateflag, IMPCHEM_HUD) \ || BITTEST(hud_updateflag, IMPTRACK_HUD)) - + var/image/holder1 = hud_list[IMPTRACK_HUD] var/image/holder2 = hud_list[IMPLOYAL_HUD] var/image/holder3 = hud_list[IMPCHEM_HUD] @@ -1673,7 +1675,7 @@ hud_list[IMPTRACK_HUD] = holder1 hud_list[IMPLOYAL_HUD] = holder2 hud_list[IMPCHEM_HUD] = holder3 - + if (BITTEST(hud_updateflag, SPECIALROLE_HUD)) var/image/holder = hud_list[SPECIALROLE_HUD] holder.icon_state = "hudblank" @@ -1734,10 +1736,10 @@ /mob/living/carbon/human/handle_fire() if(..()) return - + var/burn_temperature = fire_burn_temperature() var/thermal_protection = get_heat_protection(burn_temperature) - + if (thermal_protection < 1 && bodytemperature < burn_temperature) bodytemperature += round(BODYTEMP_HEATING_MAX*(1-thermal_protection), 1) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index ea4f9f9d41d..1162c84236f 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -37,6 +37,7 @@ var/list/unarmed_attacks = null // For empty hand harm-intent attack var/brute_mod = 1 // Physical damage multiplier. var/burn_mod = 1 // Burn damage multiplier. + var/vision_flags = 0 // Same flags as glasses. // Death vars. var/gibber_type = /obj/effect/gibspawner/human diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm index 15cf1ce7281..a854d0e6db6 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm @@ -42,6 +42,8 @@ breath_type = null poison_type = null + vision_flags = SEE_MOBS + has_organ = list( "heart" = /datum/organ/internal/heart, "brain" = /datum/organ/internal/brain/xeno, diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 2a4c748936f..2c9813d564c 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -265,7 +265,7 @@ //Unless its monkey mode monkeys cant use advanced tools /mob/living/carbon/monkey/IsAdvancedToolUser(var/silent) if(!silent) - src << "You don't have the dexterity to use [src]!" + src << "You don't have the dexterity to use that!" return 0 /mob/living/carbon/monkey/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/italics=0, var/message_range = world.view, var/list/used_radios = list()) From 0267f156b56d88057ae402cf5a48d852476ae3f9 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 17 Mar 2015 19:17:36 +1030 Subject: [PATCH 2/9] Fixes #8446 --- code/modules/mob/living/carbon/human/species/station/golem.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/golem.dm b/code/modules/mob/living/carbon/human/species/station/golem.dm index 7d7b364f5d7..f04a8cb3678 100644 --- a/code/modules/mob/living/carbon/human/species/station/golem.dm +++ b/code/modules/mob/living/carbon/human/species/station/golem.dm @@ -7,7 +7,7 @@ language = "Sol Common" //todo? unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch) - flags = IS_RESTRICTED | NO_BREATHE | NO_PAIN | NO_BLOOD | IS_SYNTHETIC | NO_SCAN | NO_POISON + flags = IS_RESTRICTED | NO_BREATHE | NO_PAIN | NO_BLOOD | NO_SCAN | NO_POISON siemens_coefficient = 0 breath_type = null From e600cdbd3bbcf1e6d0a9a7ec311fc4db2b5ef8f3 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 17 Mar 2015 19:18:30 +1030 Subject: [PATCH 3/9] Fixes #8430 --- code/game/objects/items/weapons/storage/fancy.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index a07013a79c9..116d0418c02 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -48,7 +48,10 @@ name = "egg box" storage_slots = 12 max_combined_w_class = 24 - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/egg) + can_hold = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/boiledegg + ) /obj/item/weapon/storage/fancy/egg_box/New() ..() From 7cbe2c94fbbc482e5cd9967a41083a1608d3b22a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 17 Mar 2015 19:19:28 +1030 Subject: [PATCH 4/9] Fixes #8388 --- code/modules/hydroponics/seed_storage.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index f111a6ebb94..469896018e8 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -40,7 +40,7 @@ /obj/machinery/seed_storage/garden name = "Garden seed storage" scanner = list("stats") - starting_seeds = list(/obj/item/seeds/appleseed = 3, /obj/item/seeds/bananaseed = 3, /obj/item/seeds/berryseed = 3, /obj/item/seeds/cabbageseed = 3, /obj/item/seeds/carrotseed = 3, /obj/item/seeds/chantermycelium = 3, /obj/item/seeds/cherryseed = 3, /obj/item/seeds/chiliseed = 3, /obj/item/seeds/cocoapodseed = 3, /obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/grapeseed = 3, /obj/item/seeds/grassseed = 3, /obj/item/seeds/lemonseed = 3, /obj/item/seeds/limeseed = 3, /obj/item/seeds/mtearseed = 2, /obj/item/seeds/orangeseed = 3, /obj/item/seeds/peanutseed = 3, /obj/item/seeds/plumpmycelium = 3, /obj/item/seeds/poppyseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/pumpkinseed = 3, /obj/item/seeds/riceseed = 3, /obj/item/seeds/soyaseed = 3, /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3) + starting_seeds = list(/obj/item/seeds/appleseed = 3, /obj/item/seeds/bananaseed = 3, /obj/item/seeds/berryseed = 3, /obj/item/seeds/cabbageseed = 3, /obj/item/seeds/carrotseed = 3, /obj/item/seeds/chantermycelium = 3, /obj/item/seeds/cherryseed = 3, /obj/item/seeds/chiliseed = 3, /obj/item/seeds/cocoapodseed = 3, /obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/grapeseed = 3, /obj/item/seeds/grassseed = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/lemonseed = 3, /obj/item/seeds/limeseed = 3, /obj/item/seeds/mtearseed = 2, /obj/item/seeds/orangeseed = 3, /obj/item/seeds/peanutseed = 3, /obj/item/seeds/plumpmycelium = 3, /obj/item/seeds/poppyseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/pumpkinseed = 3, /obj/item/seeds/riceseed = 3, /obj/item/seeds/soyaseed = 3, /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3) /obj/machinery/seed_storage/xenobotany name = "Xenobotany seed storage" From b766f9efcff6ed248c90fc47edd9131f5741abb1 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 17 Mar 2015 19:20:33 +1030 Subject: [PATCH 5/9] Fixes #8378 --- code/modules/mob/living/simple_animal/hostile/giant_spider.dm | 2 +- code/modules/reagents/reagent_containers/food/snacks.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 4d0792d7898..4d7a8f7e3aa 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -16,7 +16,7 @@ speak_chance = 5 turns_per_move = 5 see_in_dark = 10 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat + meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat response_help = "pets" response_disarm = "gently pushes aside" response_harm = "pokes" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 9ab669b4bba..502a741c6b4 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -684,7 +684,8 @@ New() ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent("protein", 6) + reagents.add_reagent("pacid",6) src.bitesize = 6 /obj/item/weapon/reagent_containers/food/snacks/meatball From beaba0b88f57edbd8a0efd4ac2d796dff3ea9b94 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 17 Mar 2015 19:35:25 +1030 Subject: [PATCH 6/9] Fixes #8440 --- code/modules/mob/living/carbon/carbon.dm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 464fb3a0558..defe2191bea 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -21,12 +21,11 @@ if(germ_level < GERM_LEVEL_MOVE_CAP && prob(8)) germ_level++ -/mob/living/carbon/relaymove(var/mob/user, direction) - if(user in src.stomach_contents) - if(prob(40)) - for(var/mob/M in hearers(4, src)) - if(M.client) - M.show_message(text("\red You hear something rumbling inside [src]'s stomach..."), 2) +/mob/living/carbon/relaymove(var/mob/living/user, direction) + if((user in src.stomach_contents) && istype(user)) + if(user.last_special <= world.time) + user.last_special = world.time + 50 + src.visible_message("You hear something rumbling inside [src]'s stomach...") var/obj/item/I = user.get_active_hand() if(I && I.force) var/d = rand(round(I.force / 4), I.force) @@ -40,9 +39,7 @@ H.updatehealth() else src.take_organ_damage(d) - for(var/mob/M in viewers(user, null)) - if(M.client) - M.show_message(text("\red [user] attacks [src]'s stomach wall with the [I.name]!"), 2) + user.visible_message("[user] attacks [src]'s stomach wall with the [I.name]!") playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1) if(prob(src.getBruteLoss() - 50)) From 145b4442e540191e1d36c708203c654a9d109b26 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 17 Mar 2015 19:47:58 +1030 Subject: [PATCH 7/9] Fixes #8388 --- code/modules/hydroponics/grown.dm | 15 +++++++++++++++ code/modules/hydroponics/seed_datums.dm | 3 ++- icons/obj/hydroponics_products.dmi | Bin 12610 -> 12491 bytes 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index ba6f040060c..0604fa9caba 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -298,6 +298,21 @@ if(src) del(src) return + if(seed.kitchen_tag == "grass") + user.show_message("You make a grass tile out of \the [src]!", 1) + for(var/i=0,i<2,i++) + var/obj/item/stack/tile/grass/G = new (user.loc) + G.color = seed.get_trait(TRAIT_PRODUCT_COLOUR) + for (var/obj/item/stack/tile/grass/NG in user.loc) + if(G==NG) + continue + if(NG.amount>=NG.max_amount) + continue + NG.attackby(G, user) + user << "You add the newly-formed grass to the stack. It now contains [G.amount] tiles." + del(src) + return + if(seed.get_trait(TRAIT_SPREAD) > 0) user << "You plant the [src.name]." new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed) diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index d47a6582a96..a33e20d0fd1 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -870,7 +870,8 @@ name = "grass" seed_name = "grass" display_name = "grass" - chems = list("nutriment" = list(1,20), "orangejuice" = list(1,20)) + chems = list("nutriment" = list(1,20)) + kitchen_tag = "grass" /datum/seed/grass/New() ..() diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi index 7708c4896aa348c9e443aec5759ff89816ab741b..04e0c1c7ce4be3fe34a59edeb5cfbcee590fbef8 100644 GIT binary patch delta 11306 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 delta 11403 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 From 033f758abdb722d47147e826173bd22480d06f88 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 17 Mar 2015 20:04:07 +1030 Subject: [PATCH 8/9] Fixes #8477 --- code/modules/hydroponics/seed_datums.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index a33e20d0fd1..7d69393216a 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -685,7 +685,7 @@ name = "wheat" seed_name = "wheat" display_name = "wheat stalks" - chems = list("nutriment" = list(1,25), "flour" = list(1,25)) + chems = list("nutriment" = list(1,25), "flour" = list(15,15)) kitchen_tag = "wheat" /datum/seed/wheat/New() @@ -703,7 +703,7 @@ name = "rice" seed_name = "rice" display_name = "rice stalks" - chems = list("nutriment" = list(1,25), "rice" = list(1,25)) + chems = list("nutriment" = list(1,25), "rice" = list(10,15)) kitchen_tag = "rice" /datum/seed/rice/New() From 92f53d6b80c90a4359f9606864424615c8575f82 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 17 Mar 2015 20:08:46 +1030 Subject: [PATCH 9/9] Fixes #8478 --- code/modules/reagents/Chemistry-Machinery.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 8d3f0016cf7..1b72aa115ad 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -870,8 +870,8 @@ if(istype(O,/obj/item/weapon/storage/bag/plants)) var/failed = 1 - for (var/obj/item/G in O.contents) - if(!O.reagents || !O.reagents.total_volume) + for(var/obj/item/G in O.contents) + if(!G.reagents || !G.reagents.total_volume) continue failed = 0 O.contents -= G @@ -885,9 +885,9 @@ return 1 if(!O.contents.len) - user << "You fill \the [src]." + user << "You empty \the [O] into \the [src]." else - user << "You fill \the [src]. Some of the things in the plant bag aren't suitable." + user << "You fill \the [src] from \the [O]." src.updateUsrDialog() return 0