diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index a05a60eed34..9c91f9c44d2 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -289,7 +289,7 @@
/obj/item/organ/heart/skrell,
/obj/item/latexballon)
- var/atom/movable/I = new gift_type(M)
+ var/atom/movable/I = new gift_type(get_turf(M))
M.remove_from_mob(src)
M.put_in_hands(I)
M << "You open the gift, revealing your new [I.name]! Just what you always wanted!"
@@ -357,7 +357,7 @@
/obj/item/device/megaphone,
/obj/item/device/violin)
- var/atom/movable/I = new gift_type(M)
+ var/atom/movable/I = new gift_type(get_turf(M))
M.remove_from_mob(src)
if (!M.put_in_hands(I))
M.forceMove(get_turf(src))
@@ -401,7 +401,7 @@
/obj/item/clothing/head/helmet/space/void/vaurca,
/obj/item/target/alien)
- var/atom/movable/I = new gift_type(M)
+ var/atom/movable/I = new gift_type(get_turf(M))
M.remove_from_mob(src)
M.put_in_hands(I)
M << "You open the gift, revealing your new [I.name]! Just what you always wanted!"
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index db94b49f6b7..c21721616e9 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -221,14 +221,14 @@
if(blocked < 100 && !(blocked < 20))
L.emote("yawns")
if(blocked < 20)
- addtimer(CALLBACK(src, .proc/apply_sedative, target, 10), 120)
+ if(L.reagents) L.reagents.add_reagent("stoxin", 10)
if(def_zone == "head" && blocked < 100)
- addtimer(CALLBACK(src, .proc/apply_sedative, target, 20), 35)
+ if(L.reagents) L.reagents.add_reagent("stoxin", 15)
if(def_zone != "torso" && def_zone != "head")
if(blocked < 100 && !(blocked < 20))
L.emote("yawns")
if(blocked < 20)
- addtimer(CALLBACK(src, .proc/apply_sedative, target, 15), 45)
+ if(L.reagents) L.reagents.add_reagent("stoxin", 5)
if(isanimal(target))
target.visible_message("[target] twitches, foaming at the mouth.")
@@ -239,9 +239,6 @@
M.Sleeping(1200)*/ //commented out until simple_mob paralysis actually works.
..()
-/obj/item/projectile/bullet/rifle/tranq/proc/apply_sedative(var/mob/living/L, var/severity)
- L.apply_effect(severity, PARALYZE, 0)
- L.emote("moans")
/* Miscellaneous */
/obj/item/projectile/bullet/suffocationbullet//How does this even work?
diff --git a/html/changelogs/alberyk-gunandxmas.yml b/html/changelogs/alberyk-gunandxmas.yml
new file mode 100644
index 00000000000..132d5646561
--- /dev/null
+++ b/html/changelogs/alberyk-gunandxmas.yml
@@ -0,0 +1,5 @@
+author: Alberyk
+delete-after: True
+changes:
+ - bugfix: "The tranquilizer rifle should work properly now."
+ - bugfix: "Fixed some items, such as animals, not appearing when opening a christmas gift."