mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 21:48:21 +01:00
Merge pull request #1165 from Krausus/Fixes-201505250443
Fixes: Mulebots, Catwalks, Flashbangs, Diona Suicide, Traitor Report, Challenge, Runtimes, etc.
This commit is contained in:
@@ -49,7 +49,7 @@
|
||||
if(expansion)
|
||||
qdel(expansion)
|
||||
expansion = null
|
||||
del(src)
|
||||
return ..()
|
||||
/* Easier to just call del() than this nonsense
|
||||
get_cameras()
|
||||
for(var/cam_tag in bugged_cameras)
|
||||
|
||||
@@ -107,8 +107,8 @@
|
||||
target.ex_act(1)
|
||||
if (isobj(target))
|
||||
if (target)
|
||||
del(target)
|
||||
del(src)
|
||||
qdel(target)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/c4/attack(mob/M as mob, mob/user as mob, def_zone)
|
||||
return
|
||||
@@ -36,7 +36,7 @@
|
||||
ear_safety++
|
||||
|
||||
//Flash
|
||||
if(!eye_safety)
|
||||
if(!eye_safety && ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
|
||||
flick("e_flash", M.flash)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
var/brightness = 2
|
||||
|
||||
/obj/item/weapon/shard/supermatter/New()
|
||||
src.icon_state = pick("supermatter")
|
||||
src.icon_state = "supermatter" + pick("large", "medium", "small")
|
||||
switch(src.icon_state)
|
||||
if("supermattersmall")
|
||||
src.pixel_x = rand(-12, 12)
|
||||
|
||||
Reference in New Issue
Block a user