mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-29 11:31:38 +00:00
Automatic pistol, nutriment and sprites fixes (#1617)
-fix #1217 -fix being unable to put the tactical pistol into belts/holsters, also remove needless code from it -fix the scout rifle not accepting other magazines -fix the hardsuit nutriment being useless and just dealing minor toxin damage -fix missing tactical masks and tapes from unathi and tajaran sprites -fix tapes cuffs, blinders and etc not updating when equiped to said mob -some extra tweaks to the hud code
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
/obj/item/weapon/reagent_containers/blood/attack(mob/living/carbon/human/M as mob, mob/living/carbon/human/user as mob, var/target_zone)
|
||||
if (user == M && (user.mind.vampire))
|
||||
if (reagents.get_reagent_amount("blood"))
|
||||
user.visible_message("<span class='warning'>[user] raises \the [src] up to \his[user] mouth and bites into it.</span>", "<span class='notice'>You raise \the [src] up to your mouth and bite into it, starting to drain its contents.<br>You need to stand still.</span>")
|
||||
user.visible_message("<span class='warning'>[user] raises \the [src] up to their mouth and bites into it.</span>", "<span class='notice'>You raise \the [src] up to your mouth and bite into it, starting to drain its contents.<br>You need to stand still.</span>")
|
||||
vampire_marks = TRUE
|
||||
if (!src.other_DNA.len)
|
||||
src.other_DNA += M.dna.unique_enzymes
|
||||
@@ -179,4 +179,4 @@
|
||||
|
||||
/obj/item/weapon/reagent_containers/blood/ripped/attackby(obj/item/weapon/P as obj, mob/user as mob)
|
||||
user << "<span class='warning'>You can't do anything further with this.</span>"
|
||||
return
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user