mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Miscellaneous fixes
- Fixes holodeck eswords - Fixes toy swords not showing the blade - Temporarily disables vent sounds Fixes #6265
This commit is contained in:
@@ -47,7 +47,7 @@
|
||||
var/radio_filter_out
|
||||
var/radio_filter_in
|
||||
|
||||
var/datum/looping_sound/air_pump/soundloop
|
||||
//var/datum/looping_sound/air_pump/soundloop //VOREStation Removal
|
||||
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on
|
||||
use_power = 1
|
||||
@@ -72,7 +72,7 @@
|
||||
|
||||
/obj/machinery/atmospherics/unary/vent_pump/Initialize()
|
||||
. = ..()
|
||||
soundloop = new(list(src), FALSE)
|
||||
//soundloop = new(list(src), FALSE) //VOREStation Removal
|
||||
|
||||
/obj/machinery/atmospherics/unary/vent_pump/New()
|
||||
..()
|
||||
@@ -90,7 +90,7 @@
|
||||
if(initial_loc)
|
||||
initial_loc.air_vent_info -= id_tag
|
||||
initial_loc.air_vent_names -= id_tag
|
||||
QDEL_NULL(soundloop)
|
||||
//QDEL_NULL(soundloop) //VOREStation Removal
|
||||
return ..()
|
||||
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume
|
||||
@@ -171,15 +171,15 @@
|
||||
|
||||
/obj/machinery/atmospherics/unary/vent_pump/proc/can_pump()
|
||||
if(stat & (NOPOWER|BROKEN))
|
||||
soundloop.stop()
|
||||
//soundloop.stop() //VOREStation Removal
|
||||
return 0
|
||||
if(!use_power)
|
||||
soundloop.stop()
|
||||
//soundloop.stop() //VOREStation Removal
|
||||
return 0
|
||||
if(welded)
|
||||
soundloop.stop()
|
||||
//soundloop.stop() //VOREStation Removal
|
||||
return 0
|
||||
soundloop.start()
|
||||
//soundloop.start() //VOREStation Removal
|
||||
return 1
|
||||
|
||||
/obj/machinery/atmospherics/unary/vent_pump/process()
|
||||
|
||||
Reference in New Issue
Block a user