mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
runtime avoidance
This commit is contained in:
@@ -400,6 +400,8 @@
|
|||||||
|
|
||||||
|
|
||||||
/datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind)
|
/datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind)
|
||||||
|
if(!cult_mind)
|
||||||
|
return 0
|
||||||
spawn(0)
|
spawn(0)
|
||||||
for(var/datum/mind/cultist in cult)
|
for(var/datum/mind/cultist in cult)
|
||||||
if(cultist.current)
|
if(cultist.current)
|
||||||
|
|||||||
@@ -23,9 +23,10 @@
|
|||||||
c_animation.icon_state = "[animation_icon]"
|
c_animation.icon_state = "[animation_icon]"
|
||||||
flick("cultification",c_animation)
|
flick("cultification",c_animation)
|
||||||
spawn(10)
|
spawn(10)
|
||||||
c_animation.master = null
|
if(c_animation)
|
||||||
qdel(c_animation)
|
c_animation.master = null
|
||||||
c_animation = null
|
qdel(c_animation)
|
||||||
|
c_animation = null
|
||||||
|
|
||||||
/////////////////////////////////////////FIRST RUNE
|
/////////////////////////////////////////FIRST RUNE
|
||||||
/obj/effect/rune/proc/teleport(var/key)
|
/obj/effect/rune/proc/teleport(var/key)
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ var/global/list/image/splatter_cache=list()
|
|||||||
..()
|
..()
|
||||||
update_icon()
|
update_icon()
|
||||||
|
|
||||||
if(ticker.mode && ticker.mode.name == "cult")
|
if(ticker && ticker.mode && ticker.mode.name == "cult")
|
||||||
var/datum/game_mode/cult/mode_ticker = ticker.mode
|
var/datum/game_mode/cult/mode_ticker = ticker.mode
|
||||||
if((mode_ticker.objectives[mode_ticker.current_objective] == "bloodspill") && !mode_ticker.narsie_condition_cleared)
|
if((mode_ticker.objectives[mode_ticker.current_objective] == "bloodspill") && !mode_ticker.narsie_condition_cleared)
|
||||||
var/turf/T = get_turf(src)
|
var/turf/T = get_turf(src)
|
||||||
|
|||||||
@@ -1575,7 +1575,7 @@
|
|||||||
var/client/C = usr.client
|
var/client/C = usr.client
|
||||||
if(!isobserver(usr)) C.admin_ghost()
|
if(!isobserver(usr)) C.admin_ghost()
|
||||||
sleep(2)
|
sleep(2)
|
||||||
C.jumptomob(M)
|
if(C) C.jumptomob(M)
|
||||||
|
|
||||||
else if(href_list["check_antagonist"])
|
else if(href_list["check_antagonist"])
|
||||||
check_antagonists()
|
check_antagonists()
|
||||||
|
|||||||
@@ -44,6 +44,8 @@
|
|||||||
src.add_fingerprint(user)
|
src.add_fingerprint(user)
|
||||||
|
|
||||||
/obj/item/clothing/accessory/proc/on_accessory_interact(mob/user, delayed = 0)
|
/obj/item/clothing/accessory/proc/on_accessory_interact(mob/user, delayed = 0)
|
||||||
|
if(!has_suit)
|
||||||
|
return
|
||||||
if(delayed)
|
if(delayed)
|
||||||
has_suit.remove_accessory(user, src)
|
has_suit.remove_accessory(user, src)
|
||||||
attack_hand(user)
|
attack_hand(user)
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
/obj/machinery/media/proc/update_media_source()
|
/obj/machinery/media/proc/update_media_source()
|
||||||
var/area/A = get_area_master(src)
|
var/area/A = get_area_master(src)
|
||||||
|
if(!A) return
|
||||||
// Check if there's a media source already.
|
// Check if there's a media source already.
|
||||||
if(A.media_source && A.media_source!=src) //if it does, the new media source replaces it. basically, the last media source arrived gets played on top.
|
if(A.media_source && A.media_source!=src) //if it does, the new media source replaces it. basically, the last media source arrived gets played on top.
|
||||||
A.media_source.disconnect_media_source()//you can turn a media source off and on for it to come back on top.
|
A.media_source.disconnect_media_source()//you can turn a media source off and on for it to come back on top.
|
||||||
|
|||||||
@@ -507,7 +507,7 @@ var/global/list/datum/stack_recipe/cable_recipes = list ( \
|
|||||||
viewers(user) << "<SPAN CLASS='danger'>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</SPAN>"
|
viewers(user) << "<SPAN CLASS='danger'>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</SPAN>"
|
||||||
return(OXYLOSS)
|
return(OXYLOSS)
|
||||||
|
|
||||||
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/param_color = null)
|
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/param_color = null, amount = length)
|
||||||
..()
|
..()
|
||||||
|
|
||||||
recipes = cable_recipes
|
recipes = cable_recipes
|
||||||
|
|||||||
@@ -1363,7 +1363,8 @@
|
|||||||
AM.loc = src.loc
|
AM.loc = src.loc
|
||||||
AM.pipe_eject(dir)
|
AM.pipe_eject(dir)
|
||||||
spawn(5)
|
spawn(5)
|
||||||
AM.throw_at(target, 3, 1)
|
if(AM)
|
||||||
|
AM.throw_at(target, 3, 1)
|
||||||
H.vent_gas(src.loc)
|
H.vent_gas(src.loc)
|
||||||
qdel(H)
|
qdel(H)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user