cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 07:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the hos' tranquilizer rifle and some issues with gifts (#3982)

Browse Source 
-fixes #3747 by making so that the tranq bullets inject the target with some sleeping toxin
-fixes things like random plushie and animals getting stuck into the person's contents when you open a gift
This commit is contained in:
Alberyk
2017-12-17 07:20:30 -02:00
committed by Erki
parent f8daffdcfa
commit 1d7cd87ebd
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/weapons/gift_wrappaper.dm
View File

@@ -289,7 +289,7 @@
/obj/item/organ/heart/skrell, /obj/item/organ/heart/skrell,
/obj/item/latexballon) /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.remove_from_mob(src)
M.put_in_hands(I) M.put_in_hands(I)
M << "<span class='notice'>You open the gift, revealing your new [I.name]! Just what you always wanted!</span>" M << "<span class='notice'>You open the gift, revealing your new [I.name]! Just what you always wanted!</span>"
@@ -357,7 +357,7 @@
/obj/item/device/megaphone, /obj/item/device/megaphone,
/obj/item/device/violin) /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) M.remove_from_mob(src)
if (!M.put_in_hands(I)) if (!M.put_in_hands(I))
M.forceMove(get_turf(src)) M.forceMove(get_turf(src))
@@ -401,7 +401,7 @@
/obj/item/clothing/head/helmet/space/void/vaurca, /obj/item/clothing/head/helmet/space/void/vaurca,
/obj/item/target/alien) /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.remove_from_mob(src)
M.put_in_hands(I) M.put_in_hands(I)
M << "<span class='notice'>You open the gift, revealing your new [I.name]! Just what you always wanted!</span>" M << "<span class='notice'>You open the gift, revealing your new [I.name]! Just what you always wanted!</span>"

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

@@ -221,14 +221,14 @@
if(blocked < 100 && !(blocked < 20)) if(blocked < 100 && !(blocked < 20))
L.emote("yawns") L.emote("yawns")
if(blocked < 20) 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) 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(def_zone != "torso" && def_zone != "head")
if(blocked < 100 && !(blocked < 20)) if(blocked < 100 && !(blocked < 20))
L.emote("yawns") L.emote("yawns")
if(blocked < 20) if(blocked < 20)
addtimer(CALLBACK(src, .proc/apply_sedative, target, 15), 45) if(L.reagents) L.reagents.add_reagent("stoxin", 5)
if(isanimal(target)) if(isanimal(target))
target.visible_message("<b>[target]</b> twitches, foaming at the mouth.") target.visible_message("<b>[target]</b> twitches, foaming at the mouth.")
@@ -239,9 +239,6 @@
M.Sleeping(1200)*/ //commented out until simple_mob paralysis actually works. 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 */ /* Miscellaneous */
/obj/item/projectile/bullet/suffocationbullet//How does this even work? /obj/item/projectile/bullet/suffocationbullet//How does this even work?

5
html/changelogs/alberyk-gunandxmas.yml Normal file
View File

@@ -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."