cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Completely fixed the microwave to display and handle the cheese_amount var properly.

Browse Source 
Included Skie's fix of the syringe gun firing at the table when placed on it.

ENOUGH WITH MY SILLY SMALL REVS.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@64 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
polyxenitopalidou
2010-09-06 09:03:29 +00:00
parent 325346360b
commit c0a9db6274
3 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Chemistry-Tools.dm
+29 -26
View File
@@ -224,39 +224,42 @@
proc
fire_syringe(atom/target, mob/user)
var/turf/trg = get_turf(target)
var/obj/syringe_gun_dummy/D = new/obj/syringe_gun_dummy(get_turf(src))
var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
S.reagents.trans_to(D, S.reagents.total_volume)
syringes -= S
del(S)
D.icon_state = "syringeproj"
D.name = "syringe"
playsound(user.loc, 'syringeproj.ogg', 50, 1)
if (locate (/obj/table, src.loc))
return
else
var/turf/trg = get_turf(target)
var/obj/syringe_gun_dummy/D = new/obj/syringe_gun_dummy(get_turf(src))
var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
S.reagents.trans_to(D, S.reagents.total_volume)
syringes -= S
del(S)
D.icon_state = "syringeproj"
D.name = "syringe"
playsound(user.loc, 'syringeproj.ogg', 50, 1)
for(var/i=0, i<6, i++)
if(D.loc == trg) break
step_towards(D,trg)
for(var/i=0, i<6, i++)
if(D.loc == trg) break
step_towards(D,trg)
for(var/mob/living/carbon/M in D.loc)
if(!istype(M,/mob/living/carbon)) continue
if(M == user) continue
D.reagents.trans_to(M, 15)
M.bruteloss += 5
for(var/mob/O in viewers(world.view, D))
O.show_message(text("\red [] was hit by the syringe!", M), 1)
for(var/mob/living/carbon/M in D.loc)
if(!istype(M,/mob/living/carbon)) continue
if(M == user) continue
D.reagents.trans_to(M, 15)
M.bruteloss += 5
for(var/mob/O in viewers(world.view, D))
O.show_message(text("\red [] was hit by the syringe!", M), 1)
del(D)
del(D)
for(var/atom/A in D.loc)
if(A == user) continue
if(A.density) del(D)
for(var/atom/A in D.loc)
if(A == user) continue
if(A.density) del(D)
sleep(1)
sleep(1)
spawn(10) del(D)
spawn(10) del(D)
return
return