shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Citadel-Station-13:master' into tempfeel

Browse Source
This commit is contained in:
bunny232
2021-12-08 05:21:22 -05:00
committed by GitHub
parent 0ca84b7cc5 745138068c
commit 3f3ccadde5
7 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/holiday/halloween/jacqueen.dm
View File

@@ -731,9 +731,13 @@
/obj/item/reagent_containers/potion_container/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
..()
delayed_release_smoke()
/obj/item/reagent_containers/potion_container/proc/delayed_release_smoke()
set waitfor = FALSE
sleep(20)
var/datum/effect_system/smoke_spread/chem/s = new()
s.set_up(src.reagents, 3, src.loc)
s.set_up(src.reagents, 3, get_turf(src))
s.start()
qdel(src)

11
code/modules/research/xenobiology/crossbreeding/_misc.dm
View File

@@ -92,6 +92,10 @@
icon_state = "capturedevice"
/obj/item/capturedevice/attack(mob/living/M, mob/user)
try_catching(M, user)
/obj/item/capturedevice/proc/try_catching(mob/living/M, mob/user)
set waitfor = FALSE
if(length(contents))
to_chat(user, "<span class='warning'>The device already has something inside.</span>")
return
@@ -116,7 +120,7 @@
to_chat(user, "<span class='warning'>This creature is too aggressive to capture.</span>")
return
to_chat(user, "<span class='notice'>You store [M] in the capture device.</span>")
store(M)
store(M, user)
/obj/item/capturedevice/attack_self(mob/user)
if(contents.len)
@@ -125,7 +129,10 @@
else
to_chat(user, "<span class='warning'>The device is empty...</span>")
/obj/item/capturedevice/proc/store(var/mob/living/M)
/obj/item/capturedevice/proc/store(var/mob/living/M, mob/user)
if(length(contents))
to_chat(user, "<span class='warning'>The device already has something inside.</span>")
return
M.forceMove(src)
/obj/item/capturedevice/proc/release()