cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'VALIDS' into 'Bleeding-Edge'

Browse Source 
Syringe guns now get blocked by spacesuits.

VALIDS SECURED AND LOCKED TIGHT.

See merge request !142
This commit is contained in:
d3athrow
2015-08-28 19:43:50 +00:00
parent 65e5a9158b a5263052e9
commit 8c69ec17f8
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/modules/reagents/syringe_gun.dm
View File

@@ -91,6 +91,11 @@
for(var/mob/living/carbon/M in D.loc) for(var/mob/living/carbon/M in D.loc)
if(!istype(M,/mob/living/carbon)) continue if(!istype(M,/mob/living/carbon)) continue
if(M == user) continue if(M == user) continue
var/blocked = 0
if(ishuman(M))
var/mob/living/carbon/human/H = M
blocked = istype(H.wear_suit, /obj/item/clothing/suit/space) // Block the syringe if the guy's wearing a spess suit.
//Syringe gun attack logging by Yvarov //Syringe gun attack logging by Yvarov
var/R var/R
if(D.reagents) if(D.reagents)
@@ -98,32 +103,37 @@
R += A.id + " (" R += A.id + " ("
R += num2text(A.volume) + ")," R += num2text(A.volume) + "),"
if (istype(M, /mob)) if (istype(M, /mob))
M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])" M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R]) [blocked ? "\[BLOCKED\]" : ""]"
user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])" user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R]) [blocked ? "\[BLOCKED\]" : ""]"
msg_admin_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)") msg_admin_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R]) [blocked ? "\[BLOCKED\]" : ""] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
if(!iscarbon(user)) if(!iscarbon(user))
M.LAssailant = null M.LAssailant = null
else else
M.LAssailant = user M.LAssailant = user
else else
M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])" M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R]) [blocked ? "\[BLOCKED\]" : ""]"
msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a <b>syringegun</b> ([R]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)") msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a <b>syringegun</b> ([R]) [blocked ? "\[BLOCKED\]" : ""] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
if(D.reagents) if(!blocked)
D.reagents.trans_to(M, 15) if(D.reagents)
M.visible_message("<span class='danger'>[M] is hit by the syringe!</span>") D.reagents.trans_to(M, 15)
M.visible_message("<span class='danger'>[M] is hit by the syringe!</span>")
del(D) else
var/mob/living/carbon/human/H = M
M.visible_message("<span class='danger'>[M] is hit by the syringe, but \his [H.wear_suit] blocked it!</span>") // Fuck you validhunters.
qdel(D)
break break
if(D) if(D)
for(var/atom/A in D.loc) for(var/atom/A in D.loc)
if(A == user) continue if(A == user) continue
if(A.density) del(D) if(A.density) qdel(D)
sleep(1) sleep(1)
if (D) spawn(10) del(D) if (D) spawn(10) qdel(D)
return return

4
html/changelogs/PJB3005-I-valided-the-valid-hunters.yml Normal file
View File

@@ -0,0 +1,4 @@
author: PJB3005
delete-after: true
changes:
- tweak: "Horribly ruined the life of validhunters, spacesuits now block the <s>valid gun</s> syringe gun!"