mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 19:44:09 +01:00
A new space ruin, the telecommunications satellite? [100% done, ready for final review] (#25820)
* THE WORK, IT GOES AND SO IT GOES * darker yet darker * more changes * Almost done, let's post the pr and have some dev people test it out. * update comment * small change * pushing , then we address changes * Apply suggestions from code review Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * more progress * final bar lines * aditional tweaks * Update telecomns_returns.dmm * Update code/modules/awaymissions/mission_code/ruins/telecomns.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * sirian changes * emp weakness, light changes * no runtimes, shoot borgs * sorry for all the commits just update to master thanks * Update code/modules/awaymissions/mission_code/ruins/telecomns.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * fixes * fixes pathing. Voices * removes always spawn * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * more changes * requested string change * Update code/modules/awaymissions/mission_code/ruins/telecomns.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * lewcs final changes * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
@@ -26,6 +26,8 @@
|
||||
var/list/start_showpieces = list()
|
||||
/// A flavor message to show with this item.
|
||||
var/trophy_message = ""
|
||||
/// Do we want to force alarms even if off station?
|
||||
var/force_alarm = FALSE
|
||||
|
||||
/obj/structure/displaycase/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -107,7 +109,7 @@
|
||||
|
||||
/obj/structure/displaycase/proc/trigger_alarm()
|
||||
set waitfor = FALSE
|
||||
if(alert && is_station_contact(z))
|
||||
if(alert && (is_station_contact(z) || force_alarm))
|
||||
var/area/alarmed = get_area(src)
|
||||
alarmed.burglaralert(src)
|
||||
visible_message("<span class='danger'>The burglar alarm goes off!</span>")
|
||||
|
||||
Reference in New Issue
Block a user