cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5567 from Novacat/nova-survival

Browse Source 
Adds Prototype Hypospray
This commit is contained in:
Novacat
2019-08-12 13:15:35 -04:00
committed by GitHub
parent 269cc62094 8e321b3725
commit dd7a7842ed
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/reagents/reagent_containers/hypospray.dm
View File

@@ -44,7 +44,14 @@
to_chat(user, "<span class='danger'>You cannot inject a robotic limb.</span>")
return
if(!H.stat)
//VOREStation Add Start - Adds Prototype Hypo functionality
if(H != user && prototype)
to_chat(user, "<span class='notice'>You begin injecting [H] with \the [src].</span>")
to_chat(H, "<span class='danger'> [user] is trying to inject you with \the [src]!</span>")
if(!do_after(user, 30, H))
return
//VOREstation Add End
else if(!H.stat && !prototype) //VOREStation Edit
if(H != user)
if(H.a_intent != I_HELP)
to_chat(user, "<span class='notice'>[H] is resisting your attempt to inject them with \the [src].</span>")

8
code/modules/reagents/reagent_containers/hypospray_vr.dm
View File

@@ -22,3 +22,11 @@
..()
for (var/i = 1 to 7)
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner(src)
/obj/item/weapon/reagent_containers/hypospray
var/prototype = 0
/obj/item/weapon/reagent_containers/hypospray/science
name = "prototype hypospray"
desc = "This reproduction hypospray is nearly a perfect replica of the early model DeForest hyposprays, sharing many of the same features. However, there are additional safety measures installed to prevent unwanted injections."
prototype = 1