mirror of
https://github.com/KabKebab/GS13.git
synced 2026-02-09 23:27:37 +00:00
update dump!
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
to_chat(user, "<span class='notice'>[src] are useless on the dead.</span>")
|
||||
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, "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>")
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
..()
|
||||
|
||||
55
hyperstation/code/obj/pregnancytester.dm
Normal file
55
hyperstation/code/obj/pregnancytester.dm
Normal file
@@ -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, "<span class='notice'>You force the device to read possive.</span>")
|
||||
|
||||
|
||||
|
||||
/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, "<span class='notice'>You use the pregnancy test, after a pause one pink line lights up on the display, reading negative.</span>")
|
||||
BIN
hyperstation/icons/obj/pregnancytest.dmi
Normal file
BIN
hyperstation/icons/obj/pregnancytest.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 472 B |
Binary file not shown.
|
Before Width: | Height: | Size: 850 B After Width: | Height: | Size: 849 B |
@@ -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, "<span class='warning'>Your enormous package is way to large to fit anything over!</b></span>")
|
||||
if (o.arousalloss > 32) // warning that your shaft is getting errect!
|
||||
if(W == o.w_uniform || W == o.wear_suit )
|
||||
to_chat(M, "<span class='warning'>Your swelling cock begins to strain against your clothes tightly!</b></span>")
|
||||
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, "<span class='warning'>Your erect member is way to large to fit anything over! You will need to be flaccid again to wear clothes!</b></span>")
|
||||
/*
|
||||
switch(round(P.cached_length))
|
||||
if(21)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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, "<span class='warning'>Your cock begin to strain against your clothes tightly!</b></span>")
|
||||
M.apply_damage(2.5, BRUTE, target)
|
||||
to_chat(M, "<span class='warning'>Your cock begins to strain against your clothes tightly!</b></span>")
|
||||
M.apply_damage(1, BRUTE, target)
|
||||
|
||||
P.update()
|
||||
..()
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user