mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 02:34:00 +00:00
Last of the RCD fixes I swear (#6744)
This commit is contained in:
@@ -1170,7 +1170,10 @@ var/list/WALLITEMS = list(
|
|||||||
/obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/button/remote,
|
/obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/button/remote,
|
||||||
/obj/machinery/computer/security/telescreen, /obj/machinery/embedded_controller/radio,
|
/obj/machinery/computer/security/telescreen, /obj/machinery/embedded_controller/radio,
|
||||||
/obj/item/weapon/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth,
|
/obj/item/weapon/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth,
|
||||||
/obj/structure/mirror, /obj/structure/fireaxecabinet, /obj/machinery/computer/security/telescreen/entertainment
|
/obj/structure/mirror, /obj/structure/fireaxecabinet, /obj/machinery/computer/security/telescreen/entertainment,
|
||||||
|
/obj/machinery/doorbell_chime, /obj/machinery/button/doorbell, /obj/machinery/atm, /obj/machinery/recharger/wallcharger, //CHOMPEdit
|
||||||
|
/obj/machinery/computer/guestpass, /obj/item/device/geiger/wall, /obj/machinery/button/windowtint, /obj/machinery/computer/id_restorer, //CHOMPEdit
|
||||||
|
/obj/machinery/computer/timeclock, /obj/machinery/station_map, /obj/machinery/ai_status_display //CHOMPEdit
|
||||||
)
|
)
|
||||||
/proc/gotwallitem(loc, dir)
|
/proc/gotwallitem(loc, dir)
|
||||||
for(var/obj/O in loc)
|
for(var/obj/O in loc)
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ FIRE ALARM
|
|||||||
QDEL_NULL(engalarm) // CHOMPEdit: Clearing the loop here too
|
QDEL_NULL(engalarm) // CHOMPEdit: Clearing the loop here too
|
||||||
QDEL_NULL(critalarm) // CHOMPEdit: Clearing the loop here too
|
QDEL_NULL(critalarm) // CHOMPEdit: Clearing the loop here too
|
||||||
QDEL_NULL(causality) // CHOMPEdit: Clearing the loop here too
|
QDEL_NULL(causality) // CHOMPEdit: Clearing the loop here too
|
||||||
|
reset() //CHOMPEdit alarm needs to go when destroyed
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
/obj/machinery/firealarm/proc/offset_alarm()
|
/obj/machinery/firealarm/proc/offset_alarm()
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
use_power = FALSE
|
use_power = FALSE
|
||||||
idle_power_usage = 0
|
idle_power_usage = 0
|
||||||
active_power_usage = 0
|
active_power_usage = 0
|
||||||
health = 20
|
health = 5 //extremely brittle
|
||||||
maxhealth = 20
|
maxhealth = 20
|
||||||
reqpower = 0
|
reqpower = 0
|
||||||
enabled = TRUE
|
enabled = TRUE
|
||||||
@@ -60,4 +60,8 @@
|
|||||||
|
|
||||||
else
|
else
|
||||||
// Its closed.
|
// Its closed.
|
||||||
icon_state = "turret_cover_[turret_type]"
|
icon_state = "turret_cover_[turret_type]"
|
||||||
|
|
||||||
|
/obj/machinery/porta_turret/rcd/die()
|
||||||
|
spark_system.start()
|
||||||
|
qdel(src)
|
||||||
@@ -25,26 +25,25 @@
|
|||||||
to_chat(user, "<span class='notice'>You use [src] to deactivate [H].</span>")
|
to_chat(user, "<span class='notice'>You use [src] to deactivate [H].</span>")
|
||||||
qdel(H)
|
qdel(H)
|
||||||
else
|
else
|
||||||
if(!is_blocked_turf(T, TRUE)) //can't put holograms on a tile that has dense stuff
|
if(holocreator_busy)
|
||||||
if(holocreator_busy)
|
to_chat(user, "<span class='notice'>[src] is busy creating a hologram.</span>")
|
||||||
to_chat(user, "<span class='notice'>[src] is busy creating a hologram.</span>")
|
return
|
||||||
return
|
if(signs.len < max_signs)
|
||||||
if(signs.len < max_signs)
|
playsound(src.loc, 'sound/machines/click.ogg', 20, 1)
|
||||||
playsound(src.loc, 'sound/machines/click.ogg', 20, 1)
|
if(creation_time)
|
||||||
if(creation_time)
|
holocreator_busy = TRUE
|
||||||
holocreator_busy = TRUE
|
if(!do_after(user, creation_time, target = target))
|
||||||
if(!do_after(user, creation_time, target = target))
|
|
||||||
holocreator_busy = FALSE
|
|
||||||
return
|
|
||||||
holocreator_busy = FALSE
|
holocreator_busy = FALSE
|
||||||
if(signs.len >= max_signs)
|
return
|
||||||
return
|
holocreator_busy = FALSE
|
||||||
if(is_blocked_turf(T, TRUE)) //don't try to sneak dense stuff on our tile during the wait.
|
if(signs.len >= max_signs)
|
||||||
return
|
return
|
||||||
H = new holosign_type(get_turf(target), src)
|
if(is_blocked_turf(T, TRUE)) //don't try to sneak dense stuff on our tile during the wait.
|
||||||
to_chat(user, "<span class='notice'>You create \a [H] with [src].</span>")
|
return
|
||||||
else
|
H = new holosign_type(get_turf(target), src)
|
||||||
to_chat(user, "<span class='notice'>[src] is projecting at max capacity!</span>")
|
to_chat(user, "<span class='notice'>You create \a [H] with [src].</span>")
|
||||||
|
else
|
||||||
|
to_chat(user, "<span class='notice'>[src] is projecting at max capacity!</span>")
|
||||||
|
|
||||||
/obj/item/weapon/holosign_creator/attack_self(mob/user)
|
/obj/item/weapon/holosign_creator/attack_self(mob/user)
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -369,7 +369,7 @@ rborosilicate = 12
|
|||||||
airlock_type = /obj/machinery/door/airlock
|
airlock_type = /obj/machinery/door/airlock
|
||||||
airlock_glass = FALSE
|
airlock_glass = FALSE
|
||||||
|
|
||||||
/obj/item/weapon/rcd/verb/change_airlock_access(mob/user)
|
/obj/item/weapon/rcd/proc/change_airlock_access(mob/user)
|
||||||
|
|
||||||
if (!ishuman(user) && !istype(user,/mob/living/silicon/robot))
|
if (!ishuman(user) && !istype(user,/mob/living/silicon/robot))
|
||||||
return
|
return
|
||||||
@@ -695,6 +695,8 @@ rborosilicate = 12
|
|||||||
to_chat(user, span("notice", "You build a conveyor"))
|
to_chat(user, span("notice", "You build a conveyor"))
|
||||||
return TRUE
|
return TRUE
|
||||||
if(RCD_TURRET)
|
if(RCD_TURRET)
|
||||||
|
if(locate(/obj/machinery/porta_turret) in src)
|
||||||
|
return FALSE
|
||||||
var/obj/machinery/porta_turret/T = new /obj/machinery/porta_turret/rcd(src)
|
var/obj/machinery/porta_turret/T = new /obj/machinery/porta_turret/rcd(src)
|
||||||
T.faction = the_rcd.turret_faction
|
T.faction = the_rcd.turret_faction
|
||||||
return TRUE
|
return TRUE
|
||||||
@@ -744,6 +746,9 @@ rborosilicate = 12
|
|||||||
else
|
else
|
||||||
if(dx > 0) direction = EAST
|
if(dx > 0) direction = EAST
|
||||||
else direction = WEST
|
else direction = WEST
|
||||||
|
if(gotwallitem(get_step(src,direction), direction))
|
||||||
|
to_chat(user, span("warning", "There is already a wall item there!"))
|
||||||
|
return FALSE
|
||||||
var/obj/O = new the_rcd.wall_frame_type(get_step(src,direction))
|
var/obj/O = new the_rcd.wall_frame_type(get_step(src,direction))
|
||||||
O.dir = direction
|
O.dir = direction
|
||||||
if(istype(O,/obj/machinery/light))
|
if(istype(O,/obj/machinery/light))
|
||||||
|
|||||||
Reference in New Issue
Block a user