mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 00:21:11 +01:00
Fix heist not ending again with the transfer shuttle (#1633)
-fix heist not ending when the transfer/emergency shuttle lands at odin -remove the santa bag from the random bags pool - Fixes #1634 -fix the scrying orb killing people
This commit is contained in:
@@ -16,8 +16,7 @@ VOX HEIST ROUNDTYPE
|
||||
antag_tags = list(MODE_RAIDER)
|
||||
|
||||
/datum/game_mode/heist/check_finished()
|
||||
if(!..())
|
||||
var/datum/shuttle/multi_shuttle/skipjack = shuttle_controller.shuttles["Skipjack"]
|
||||
if (skipjack && skipjack.returned_home)
|
||||
return 1
|
||||
return 0
|
||||
var/datum/shuttle/multi_shuttle/skipjack = shuttle_controller.shuttles["Skipjack"]
|
||||
if (skipjack && skipjack.returned_home)
|
||||
return 1
|
||||
return ..()
|
||||
|
||||
@@ -305,7 +305,6 @@
|
||||
var/list/packs = list(
|
||||
/obj/item/weapon/storage/backpack = 3,
|
||||
/obj/item/weapon/storage/backpack/holding = 0.5,
|
||||
/obj/item/weapon/storage/backpack/santabag = 2,
|
||||
/obj/item/weapon/storage/backpack/cultpack = 2,
|
||||
/obj/item/weapon/storage/backpack/clown = 2,
|
||||
/obj/item/weapon/storage/backpack/medic = 3,
|
||||
|
||||
@@ -337,19 +337,20 @@
|
||||
playsound(user, fire_sound, 10, 1)
|
||||
else
|
||||
playsound(user, fire_sound, 50, 1)
|
||||
if(istype(in_chamber, /obj/item/projectile/beam/lastertag))
|
||||
|
||||
in_chamber.on_hit(M)
|
||||
|
||||
if (in_chamber.damage == 0)
|
||||
user.show_message("<span class = 'warning'>You feel rather silly, trying to commit suicide with a toy.</span>")
|
||||
mouthshoot = 0
|
||||
return
|
||||
|
||||
in_chamber.on_hit(M)
|
||||
if (in_chamber.damage_type != HALLOSS)
|
||||
else if (in_chamber.damage_type == HALLOSS)
|
||||
user << "<span class = 'notice'>Ow...</span>"
|
||||
user.apply_effect(110,AGONY,0)
|
||||
else
|
||||
log_and_message_admins("[key_name(user)] commited suicide using \a [src]")
|
||||
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1)
|
||||
user.death()
|
||||
else
|
||||
user << "<span class = 'notice'>Ow...</span>"
|
||||
user.apply_effect(110,AGONY,0)
|
||||
qdel(in_chamber)
|
||||
mouthshoot = 0
|
||||
return
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
new /obj/effect/decal/cleanable/ash(get_turf(user))
|
||||
E.removed(user)
|
||||
qdel(E)
|
||||
H.adjustBrainLoss(60)
|
||||
H.adjustBrainLoss(50)
|
||||
H.hallucination += 20
|
||||
return
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user