diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 33211757e4..8aaa42b3a2 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -1679,6 +1679,9 @@ reagents = R R.my_atom = src +/obj/item/weapon/grown/proc/changePotency(newValue) //-QualityVan + potency = newValue + /obj/item/weapon/grown/log name = "tower-cap log" desc = "It's better than bad, it's good!" diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index d911466d15..5a67d06db0 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -820,7 +820,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) var/t_amount = 0 while ( t_amount < (yield * parent.yieldmod )) - var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new produce(user.loc, potency) // User gets a consumable + var/obj/item/weapon/grown/t_prod = new produce(user.loc, potency) // User gets a consumable -QualityVan t_prod.seed = mypath t_prod.species = species t_prod.lifespan = lifespan @@ -828,7 +828,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) t_prod.maturation = maturation t_prod.production = production t_prod.yield = yield - t_prod.potency = potency + t_prod.changePotency(potency) // -QualityVan t_prod.plant_type = plant_type t_amount++ @@ -840,7 +840,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) var/t_amount = 0 while ( t_amount < (yield * parent.yieldmod )) - var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new produce(user.loc, potency) // User gets a consumable + var/obj/item/weapon/grown/t_prod = new produce(user.loc, potency) // User gets a consumable -QualityVan t_prod.seed = mypath t_prod.species = species t_prod.lifespan = lifespan @@ -848,7 +848,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) t_prod.maturation = maturation t_prod.production = production t_prod.yield = yield - t_prod.potency = potency + t_prod.changePotency(potency) // -QualityVan t_prod.plant_type = plant_type t_amount++ diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 2b6ff81bb1..e88798c6df 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -97,6 +97,10 @@ Craftables (Cob pipes, potato batteries, pumpkinheads) usr << "All the leaves have fallen off the nettle from violent whacking." del(src) +/obj/item/weapon/grown/nettle/changePotency(newValue) //-QualityVan + potency = newValue + force = round((5+potency/5), 1) + // Deathnettle @@ -135,6 +139,10 @@ Craftables (Cob pipes, potato batteries, pumpkinheads) usr << "All the leaves have fallen off the deathnettle from violent whacking." del(src) +/obj/item/weapon/grown/deathnettle/changePotency(newValue) //-QualityVan + potency = newValue + force = round((5+potency/2.5), 1) + //Crafting /obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm index b9184b5ee0..10d474956d 100644 --- a/code/game/objects/storage/storage.dm +++ b/code/game/objects/storage/storage.dm @@ -230,11 +230,8 @@ src.closer.icon_state = "x" src.closer.layer = 20 spawn( 5 ) - var/col_num = 0 var/row_count = min(7,storage_slots) -1 - if (contents.len > 7) - if(contents.len % 7) - col_num = round(contents.len / 7) // 7 is the maximum allowed column height for r_hand, l_hand and back storage items. + var/col_num = round((storage_slots - 1) / 7) // 7 is the maximum allowed column height for r_hand, l_hand and back storage items. -Yvarov src.orient_objs(5, 10+col_num, 5 + row_count, 10) return return diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index e7421c87ec..7dbcef90f1 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -551,10 +551,22 @@ for(var/mob/living/carbon/M in D.loc) if(!istype(M,/mob/living/carbon)) continue if(M == user) continue + //Syring gune attack logging by Yvarov + var/R + for(var/datum/reagent/A in D.reagents.reagent_list) + R += A.id + " (" + R += num2text(A.volume) + ")," + if (istype(M, /mob)) + M.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] shot [M]/[M.ckey] with a syringegun ([R])" + user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] shot [M]/[M.ckey] with a syringegun ([R])" + log_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R])") + else + M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a syringegun ([R])" + log_attack("UNKNOWN shot [M] ([M.ckey]) with a syringegun ([R])") D.reagents.trans_to(M, 15) M.take_organ_damage(5) for(var/mob/O in viewers(world.view, D)) - O.show_message(text("\red [] was hit by the syringe!", M), 1) + O.show_message(text("\red [] is hit by the syringe!", M.name), 1) del(D) if(D) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 8dbce17606..d1aced5c5f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -29,21 +29,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & XRAY) - src.sight |= SEE_TURFS - src.sight |= SEE_MOBS - src.sight |= SEE_OBJS - src.see_in_dark = 8 - src.see_invisible = 2 - else if (src.stat != 2) - src.sight |= SEE_MOBS - src.sight |= SEE_TURFS - src.sight &= ~SEE_OBJS - src.see_in_dark = 5 - src.see_invisible = 2 - - if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping) - if (src.rest) src.rest.icon_state = text("rest[]", src.resting) + ..() //-Yvarov if (src.healths) if (src.stat != 2) @@ -82,7 +68,7 @@ if(src.sleeping) Paralyse(3) - if (prob(10) && health) spawn(0) emote("snore") + //if (prob(10) && health) spawn(0) emote("snore") Invalid Emote src.sleeping-- if(src.resting) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm index bf59ead8c0..3991d1f563 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -29,21 +29,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & XRAY) - src.sight |= SEE_TURFS - src.sight |= SEE_MOBS - src.sight |= SEE_OBJS - src.see_in_dark = 8 - src.see_invisible = 2 - else if (src.stat != 2) - src.sight |= SEE_MOBS - src.sight &= SEE_TURFS - src.sight &= ~SEE_OBJS - src.see_in_dark = 7 - src.see_invisible = 3 - - if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping) - if (src.rest) src.rest.icon_state = text("rest[]", src.resting) + ..() //-Yvarov if (src.healths) if (src.stat != 2) @@ -83,7 +69,7 @@ if(src.sleeping) Paralyse(3) - if (prob(10) && health) spawn(0) emote("snore") + //if (prob(10) && health) spawn(0) emote("snore") Invalid Emote src.sleeping-- if(src.resting) diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 3e6f48dc1b..e92f33e63c 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -404,7 +404,7 @@ if(src.sleeping) Paralyse(3) - if (prob(10) && health) spawn(0) emote("snore") + //if (prob(10) && health) emote("snore") //Invalid emote for aliens, but it might be worth making sleep noticeable somehow -Yvarov src.sleeping-- if(src.resting) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 85c00eebf9..5f06fb6bf1 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -32,21 +32,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & XRAY) - src.sight |= SEE_TURFS - src.sight |= SEE_MOBS - src.sight |= SEE_OBJS - src.see_in_dark = 8 - src.see_invisible = 2 - else if (src.stat != 2) - src.sight |= SEE_MOBS - src.sight |= SEE_TURFS - src.sight &= ~SEE_OBJS - src.see_in_dark = 8 - src.see_invisible = 2 - - if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping) - if (src.rest) src.rest.icon_state = text("rest[]", src.resting) + ..() //-Yvarov if (src.healths) if (src.stat != 2) @@ -84,7 +70,7 @@ if(src.sleeping) Paralyse(3) - if (prob(10) && health) spawn(0) emote("snore") + //if (prob(10) && health) spawn(0) emote("snore") Invalid Emote src.sleeping-- if(src.resting) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 054208e2f0..bb83808b24 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -327,7 +327,7 @@ if(sleeping) Paralyse(3) - if (prob(10) && health) spawn(0) emote("snore") + //if (prob(10) && health) spawn(0) emote("snore") Invalid Emote sleeping-- if(resting) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 2f4ac03ba6..4f1e276333 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -157,7 +157,7 @@ hogan name = "Hulk Hogan Mustache" - icon_state = "facial_chaplin" + icon_state = "facial_hogan" //-Neek vandyke name = "Van Dyke Mustache"