cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Last of the RCD fixes I swear (#6744)

Browse Source
This commit is contained in:
BlackMajor
2023-08-08 00:41:49 +12:00
committed by GitHub
parent c5b0c635f2
commit 65a031eb21
5 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_helpers/unsorted.dm
View File

@@ -1170,7 +1170,10 @@ var/list/WALLITEMS = list(
/obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/button/remote,
/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/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)
for(var/obj/O in loc)

1
code/game/machinery/fire_alarm.dm
View File

@@ -71,6 +71,7 @@ FIRE ALARM
QDEL_NULL(engalarm) // CHOMPEdit: Clearing the loop here too
QDEL_NULL(critalarm) // CHOMPEdit: Clearing the loop here too
QDEL_NULL(causality) // CHOMPEdit: Clearing the loop here too
reset() //CHOMPEdit alarm needs to go when destroyed
return ..()
/obj/machinery/firealarm/proc/offset_alarm()

6
modular_chomp/code/game/machinery/portable_turret.dm
View File

@@ -3,7 +3,7 @@
use_power = FALSE
idle_power_usage = 0
active_power_usage = 0
health = 20
health = 5 //extremely brittle
maxhealth = 20
reqpower = 0
enabled = TRUE
@@ -61,3 +61,7 @@
else
// Its closed.
icon_state = "turret_cover_[turret_type]"
/obj/machinery/porta_turret/rcd/die()
spark_system.start()
qdel(src)

1
modular_chomp/code/game/objects/items/holosign_creator.dm
View File

@@ -25,7 +25,6 @@
to_chat(user, "<span class='notice'>You use [src] to deactivate [H].</span>")
qdel(H)
else
if(!is_blocked_turf(T, TRUE)) //can't put holograms on a tile that has dense stuff
if(holocreator_busy)
to_chat(user, "<span class='notice'>[src] is busy creating a hologram.</span>")
return

7
modular_chomp/code/game/objects/items/weapons/RCD.dm
View File

@@ -369,7 +369,7 @@ rborosilicate = 12
airlock_type = /obj/machinery/door/airlock
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))
return
@@ -695,6 +695,8 @@ rborosilicate = 12
to_chat(user, span("notice", "You build a conveyor"))
return TRUE
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)
T.faction = the_rcd.turret_faction
return TRUE
@@ -744,6 +746,9 @@ rborosilicate = 12
else
if(dx > 0) direction = EAST
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))
O.dir = direction
if(istype(O,/obj/machinery/light))