mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-31 07:57:47 +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:
co-authored by
1080pCat
Ryan
warriorstar-orion
Luc
parent
e4ed1b1db3
commit
26f28cb7e7
@@ -100,6 +100,9 @@
|
||||
/// Being hijacked by a pulse demon?
|
||||
var/being_hijacked = FALSE
|
||||
|
||||
/// Are we immune to EMPS?
|
||||
var/emp_proof = FALSE
|
||||
|
||||
/*** APC Malf AI Vars ****/
|
||||
var/malfhack = FALSE //New var for my changes to AI malf. --NeoFite
|
||||
var/mob/living/silicon/ai/malfai = null //See above --NeoFite
|
||||
@@ -108,6 +111,9 @@
|
||||
var/constructed = FALSE
|
||||
var/overload = 1 //used for the Blackout malf module
|
||||
|
||||
/// Are we hacked by a ruins malf AI? If so, it will act like a malf AI hacked APC, but silicons and malf AI's will not be able to interface with it.
|
||||
var/hacked_by_ruin_AI = FALSE
|
||||
|
||||
/*** APC Overlay Vars ***/
|
||||
var/update_state = -1
|
||||
var/update_overlay = -1
|
||||
@@ -485,12 +491,14 @@
|
||||
return TRUE
|
||||
|
||||
autoflag = 5 //why the hell is this being set to 5, fucking malf code -sirryan
|
||||
if(issilicon(user))
|
||||
var/mob/living/silicon/ai/AI = user
|
||||
var/mob/living/silicon/robot/robot = user
|
||||
if(aidisabled || (malfhack && istype(malfai) && ((istype(AI) && (malfai != AI && malfai != AI.parent))) || (istype(robot) && malfai && !(robot in malfai.connected_robots))))
|
||||
if(issilicon(user) || ispulsedemon(user))
|
||||
if(hacked_by_ruin_AI)
|
||||
to_chat(user, "<span class='danger'>The APC interface program has been completely corrupted, you are unable to interface with it!</span>")
|
||||
return FALSE
|
||||
var/mob/living/L = user
|
||||
if(!L.can_remote_apc_interface(src))
|
||||
if(!loud)
|
||||
to_chat(user, "<span class='danger'>\The [src] has AI control disabled!</span>")
|
||||
to_chat(user, "<span class='danger'>[src] has AI control disabled!</span>")
|
||||
return FALSE
|
||||
else
|
||||
if((!in_range(src, user) || !isturf(loc)))
|
||||
@@ -947,6 +955,8 @@
|
||||
/// *************
|
||||
|
||||
/obj/machinery/power/apc/emp_act(severity)
|
||||
if(emp_proof)
|
||||
return
|
||||
if(cell)
|
||||
cell.emp_act(severity)
|
||||
if(occupier)
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
update_state |= UPSTATE_OPENED1
|
||||
if(opened == APC_COVER_OFF)
|
||||
update_state |= UPSTATE_OPENED2
|
||||
else if(emagged || malfai || being_hijacked)
|
||||
else if(emagged || malfai || being_hijacked || hacked_by_ruin_AI)
|
||||
update_state |= UPSTATE_BLUESCREEN
|
||||
else if(panel_open)
|
||||
update_state |= UPSTATE_WIREEXP
|
||||
|
||||
@@ -295,6 +295,9 @@
|
||||
origin_tech = "powerstorage=10;bluespace=10"
|
||||
self_recharge = TRUE
|
||||
|
||||
/obj/item/stock_parts/cell/bluespace/trapped
|
||||
rigged = TRUE
|
||||
|
||||
/obj/item/stock_parts/cell/infinite
|
||||
name = "infinite-capacity power cell!"
|
||||
icon_state = "icell"
|
||||
|
||||
Reference in New Issue
Block a user