diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index ea6041c3..143d77bc 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -19,6 +19,7 @@ icon_state = "fork" force = 5 w_class = WEIGHT_CLASS_TINY + grind_results = list(/datum/reagent/iron = 3, /datum/reagent/silver = 3) throwforce = 0 throw_speed = 3 throw_range = 5 @@ -58,6 +59,7 @@ name = "kitchen knife" icon_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." + grind_results = list(/datum/reagent/iron = 3, /datum/reagent/silver = 3) flags_1 = CONDUCT_1 force = 10 w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index d6e99f73..de1fc11f 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -78,7 +78,7 @@ to_chat(user, "[src] are useless on the dead.") return if(H != user) - H.visible_message("[user] forces [H] to apply [src]... [H.p_they()] quickly regenerate all injuries!") + H.visible_message("[user] forces [H] to apply [src]... they quickly regenerate all injuries!") SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other")) else to_chat(user, "You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.") diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 02d8a515..31b046d9 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -36,7 +36,7 @@ var/datum/point/vector/trajectory var/trajectory_ignore_forcemove = FALSE //instructs forceMove to NOT reset our trajectory to the new location! - var/speed = 0.8 //Amount of deciseconds it takes for projectile to travel + var/speed = 0.5 //Amount of deciseconds it takes for projectile to travel var/Angle = 0 var/original_angle = 0 //Angle at firing var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index eb7438aa..9408188a 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1170,6 +1170,7 @@ overdose_threshold = 25 pH = 11 +//Hyperstation 13 nerf. /datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/M) M.adjustBruteLoss(-3 * REM, 0) M.adjustFireLoss(-3 * REM, 0) @@ -1177,7 +1178,7 @@ M.adjustToxLoss(-3 * REM, 0, TRUE) //Heals TOXINLOVERS M.adjustBrainLoss(2 * REM, 150) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that! M.adjustCloneLoss(-1 * REM, 0) - M.adjustStaminaLoss(-30 * REM, 0) + M.adjustStaminaLoss(-3 * REM, 0) M.jitteriness = min(max(0, M.jitteriness + 3), 30) M.druggy = min(max(0, M.druggy + 10), 15) //See above ..() diff --git a/hyperstation/code/obj/pregnancytester.dm b/hyperstation/code/obj/pregnancytester.dm new file mode 100644 index 00000000..dcf12cff --- /dev/null +++ b/hyperstation/code/obj/pregnancytester.dm @@ -0,0 +1,55 @@ +/obj/item/pregnancytest + name = "pregnancy test" + desc = "a one time use small device, used to determine if someone is pregnant or not. Also comes with a force feature to freak out your ex (alt click)." + icon = 'hyperstation/icons/obj/pregnancytest.dmi' + throwforce = 0 + icon_state = "ptest" + var/status = 0 + var/results = "null" + w_class = WEIGHT_CLASS_TINY + + +/obj/item/pregnancytest/attack_self(mob/user) + if(QDELETED(src)) + return + if(!isliving(user)) + return + if(isAI(user)) + return + if(user.stat > 0)//unconscious or dead + return + if(status == 1) + return //Already been used once, pregnancy tests only work once. + test(user) + + +/obj/item/pregnancytest/AltClick(mob/living/user) + if(QDELETED(src)) + return + if(!isliving(user)) + return + if(isAI(user)) + return + if(user.stat > 0)//unconscious or dead + return //Already been used once, pregnancy tests only work once. + if(status == 1) + return + force(user) + +/obj/item/pregnancytest/proc/force(mob/living/user) + //just for fun or roleplay, force it. + results = "positive" + icon_state = "positive" + status = 1 + name = "[results] pregnancy test" + to_chat(user, "You force the device to read possive.") + + + +/obj/item/pregnancytest/proc/test(mob/living/user) +//This is where the pregancy checker would be, if and when pregnancy is coded. SO we can always assume the person is not pregnant because there is no code for it. + results = "negative" + icon_state = "negative" + name = "[results] pregnancy test" + status = 1 + to_chat(user, "You use the pregnancy test, after a pause one pink line lights up on the display, reading negative.") diff --git a/hyperstation/icons/obj/pregnancytest.dmi b/hyperstation/icons/obj/pregnancytest.dmi new file mode 100644 index 00000000..d7563cad Binary files /dev/null and b/hyperstation/icons/obj/pregnancytest.dmi differ diff --git a/icons/obj/smooth_structures/table.dmi b/icons/obj/smooth_structures/table.dmi index 2f1362bd..5d856bf1 100644 Binary files a/icons/obj/smooth_structures/table.dmi and b/icons/obj/smooth_structures/table.dmi differ diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index cda9c174..52dcce66 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -151,10 +151,14 @@ var/items = o.get_contents() for(var/obj/item/W in items) - if(W == o.w_uniform || W == o.wear_suit) - o.dropItemToGround(W, TRUE) - playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) - to_chat(owner, "Your enormous package is way to large to fit anything over!") + if (o.arousalloss > 32) // warning that your shaft is getting errect! + if(W == o.w_uniform || W == o.wear_suit ) + to_chat(M, "Your swelling cock begins to strain against your clothes tightly!") + if (o.arousalloss > 33) + if(W == o.w_uniform || W == o.wear_suit ) + o.dropItemToGround(W, TRUE) + playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) + to_chat(owner, "Your erect member is way to large to fit anything over! You will need to be flaccid again to wear clothes!") /* switch(round(P.cached_length)) if(21) diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 2bab2a91..c67dda83 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -18,6 +18,7 @@ /obj/item/reagent_containers/glass/bottle/morphine = 4, /obj/item/reagent_containers/glass/bottle/toxin = 3, /obj/item/reagent_containers/syringe/antiviral = 6, + /obj/item/pregnancytest = 5, /obj/item/storage/hypospraykit/fire = 2, /obj/item/storage/hypospraykit/toxin = 2, /obj/item/storage/hypospraykit/o2 = 2, diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm index d9b9e96e..7c22d9d1 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm @@ -273,8 +273,8 @@ if (P.cached_length >= 20.5 && P.cached_length < 21) if(H.w_uniform || H.wear_suit|| H.arousalloss > 33) var/target = M.get_bodypart(BODY_ZONE_CHEST) - to_chat(M, "Your cock begin to strain against your clothes tightly!") - M.apply_damage(2.5, BRUTE, target) + to_chat(M, "Your cock begins to strain against your clothes tightly!") + M.apply_damage(1, BRUTE, target) P.update() ..() diff --git a/tgstation.dme b/tgstation.dme index d8b85bd4..304b649e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2837,6 +2837,7 @@ #include "hyperstation\code\mobs\werewolf.dm" #include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm" #include "hyperstation\code\obj\decal.dm" +#include "hyperstation\code\obj\pregnancytester.dm" #include "interface\interface.dm" #include "interface\menu.dm" #include "interface\stylesheet.dm"