mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 15:37:36 +01:00
Adds an abandoned security shuttle space ruin (#25922)
* Update cell.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update medbeam.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update crates.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update mob_spawn.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update undead.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update space_ruins.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update space_areas.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Add files via upload Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Add files via upload Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update medbeam.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update space_ruins.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update undead.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update mob_spawn.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update abandoned_sec_shuttle.dmm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update space_ruins.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update cell.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update code/modules/projectiles/guns/medbeam.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update code/game/objects/structures/crates_lockers/crates.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update crates.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update medbeam.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update medbeam.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update abandoned_sec_shuttle.dmm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update config.toml Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update effects.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update particles.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Add files via upload Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update medbeam.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update effects.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update space_ruins.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update space_ruins.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update code/modules/projectiles/guns/medbeam.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update code/modules/projectiles/guns/medbeam.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update code/modules/projectiles/guns/medbeam.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Update space_areas.dm Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Add files via upload Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Add files via upload Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> * Add files via upload Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> --------- Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com> Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
@@ -181,6 +181,7 @@
|
||||
if(parent)
|
||||
UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING))
|
||||
QDEL_NULL(particles)
|
||||
holding_parent = null
|
||||
parent.vis_contents -= src
|
||||
return ..()
|
||||
|
||||
@@ -206,9 +207,9 @@
|
||||
|
||||
// Add new
|
||||
if(isitem(attached_to) && ismob(attached_to.loc)) //special case we want to also be emitting from the mob
|
||||
var/mob/particle_mob = attached_to.loc
|
||||
holding_parent = attached_to.loc
|
||||
last_attached_location_type = attached_to.loc
|
||||
particle_mob.vis_contents += src
|
||||
holding_parent.vis_contents += src
|
||||
|
||||
// Readd to ourselves
|
||||
attached_to.vis_contents |= src
|
||||
|
||||
@@ -678,3 +678,24 @@
|
||||
log_admin(msg)
|
||||
|
||||
#undef RECURSION_PANIC_AMOUNT
|
||||
|
||||
/obj/structure/closet/crate/secure/sec_shuttle_ruin
|
||||
name = "locked crate"
|
||||
desc = "The side of the crate has a slot for a keycard to be swiped."
|
||||
can_be_emaged = FALSE
|
||||
|
||||
/obj/structure/closet/crate/secure/sec_shuttle_ruin/allowed(mob/user)
|
||||
if(!user)
|
||||
return
|
||||
|
||||
var/obj/item/card/sec_shuttle_ruin/keycard = user.get_active_hand()
|
||||
if(!istype(keycard))
|
||||
return
|
||||
|
||||
to_chat(user, "<span class='notice'>You swipe [keycard] in [src]'s keycard slot.</span>")
|
||||
return TRUE
|
||||
|
||||
/obj/item/card/sec_shuttle_ruin
|
||||
name = "warden's card"
|
||||
desc = "A card used by the warden to unlock their crate."
|
||||
icon_state = "data"
|
||||
|
||||
Reference in New Issue
Block a user