cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

/decl/chem (#10538)

Browse Source
This commit is contained in:
MarinaGryphon
2021-01-16 16:11:28 -06:00
committed by GitHub
parent 2ced864e12
commit c720e947ed
237 changed files with 5745 additions and 7000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/launcher/syringe_gun.dm
View File

@@ -51,9 +51,9 @@
var/mob/living/L = hit_atom
//unfortuately we don't know where the dart will actually hit, since that's done by the parent.
if(L.can_inject() && syringe.reagents)
var/datum/reagent/reagent_log = syringe.reagents.get_reagents()
var/decl/reagent/reagent_log = syringe.reagents.get_reagents()
syringe.reagents.trans_to_mob(L, 15, CHEM_BLOOD)
admin_inject_log(thrower, L, src, reagent_log, reagent_log.get_temperature(), 15, violent=1)
admin_inject_log(thrower, L, src, reagent_log, syringe.reagents.get_temperature(), 15, violent=1)
syringe.break_syringe(iscarbon(hit_atom)? hit_atom : null)
syringe.update_icon()

13
code/modules/projectiles/guns/projectile/dartgun.dm
View File

@@ -101,9 +101,9 @@
if (beakers.len)
to_chat(user, "<span class='notice'>[src] contains:</span>")
for(var/obj/item/reagent_containers/glass/beaker/B in beakers)
if(B.reagents && B.reagents.reagent_list.len)
for(var/datum/reagent/R in B.reagents.reagent_list)
to_chat(user, "<span class='notice'>[R.volume] units of [R.name]</span>")
for(var/_R in B.reagents.reagent_volumes)
var/decl/reagent/R = decls_repository.get_decl(_R)
to_chat(user, "<span class='notice'>[B.reagents.reagent_volumes[_R]] units of [R.name]</span>")
/obj/item/gun/projectile/dartgun/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/reagent_containers/glass))
@@ -136,9 +136,10 @@
var/i = 1
for(var/obj/item/reagent_containers/glass/beaker/B in beakers)
dat += "Beaker [i] contains: "
if(B.reagents && B.reagents.reagent_list.len)
for(var/datum/reagent/R in B.reagents.reagent_list)
dat += "<br> [R.volume] units of [R.name], "
if(LAZYLEN(B.reagents.reagent_volumes))
for(var/_R in B.reagents.reagent_volumes)
var/decl/reagent/R = decls_repository.get_decl(_R)
dat += "<br> [B.reagents.reagent_volumes[_R]] units of [R.name], "
if (check_beaker_mixing(B))
dat += text("<A href='?src=\ref[src];stop_mix=[i]'><font color='green'>Mixing</font></A> ")
else

6
code/modules/projectiles/guns/projectile/musket.dm
View File

@@ -57,11 +57,11 @@
to_chat(user, SPAN_WARNING("\The [src] is already full of gunpowder."))
return
var/obj/item/reagent_containers/C = W
if(C.reagents.has_reagent(/datum/reagent/gunpowder, 5))
if(C.reagents.has_reagent(/decl/reagent/gunpowder, 5))
if(do_after(user, 15))
if(has_powder)
return
C.reagents.remove_reagent(/datum/reagent/gunpowder, 5)
C.reagents.remove_reagent(/decl/reagent/gunpowder, 5)
has_powder = TRUE
to_chat(user, SPAN_NOTICE("You fill \the [src] with gunpowder."))
@@ -75,4 +75,4 @@
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5)
volume = 30
reagents_to_add = list(/datum/reagent/gunpowder = 30)
reagents_to_add = list(/decl/reagent/gunpowder = 30)

6
code/modules/projectiles/projectile/bullets.dm
View File

@@ -264,14 +264,14 @@
if(blocked < 100 && !(blocked < 20))
L.emote("yawns")
if(blocked < 20)
if(L.reagents) L.reagents.add_reagent(/datum/reagent/soporific, 10)
if(L.reagents) L.reagents.add_reagent(/decl/reagent/soporific, 10)
if(def_zone == BP_HEAD && blocked < 100)
if(L.reagents) L.reagents.add_reagent(/datum/reagent/soporific, 15)
if(L.reagents) L.reagents.add_reagent(/decl/reagent/soporific, 15)
if(def_zone != "torso" && def_zone != BP_HEAD)
if(blocked < 100 && !(blocked < 20))
L.emote("yawns")
if(blocked < 20)
if(L.reagents) L.reagents.add_reagent(/datum/reagent/soporific, 5)
if(L.reagents) L.reagents.add_reagent(/decl/reagent/soporific, 5)
if(isanimal(target))
target.visible_message("<b>[target]</b> twitches, foaming at the mouth.")