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

Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

Browse Source 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
This commit is contained in:
izac112
2020-01-31 18:23:34 +01:00
parent 1892d7be7e d336d3e558
commit 933385020f
171 changed files with 53648 additions and 5640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/power/apc.dm
View File

@@ -1183,7 +1183,7 @@
// defines a state machine, returns the new state
obj/machinery/power/apc/proc/autoset(var/cur_state, var/on)
switch(cur_state)
if(POWERCHAN_OFF); //autoset will never turn on a channel set to off
//if(POWERCHAN_OFF); //autoset will never turn on a channel set to off
if(POWERCHAN_OFF_AUTO)
if(on == 1)
return POWERCHAN_ON_AUTO

1
code/modules/power/fusion/fuel_assembly/fuel_control.dm
View File

@@ -1,5 +1,6 @@
/obj/machinery/computer/fusion_fuel_control
name = "fuel injection control computer"
desc = "Displays information about the fuel rods."
icon = 'icons/obj/machines/power/fusion.dmi'
icon_state = "fuel"
circuit = /obj/item/weapon/circuitboard/fusion_fuel_control

1
code/modules/power/fusion/gyrotron/gyrotron_control.dm
View File

@@ -1,5 +1,6 @@
/obj/machinery/computer/gyrotron_control
name = "gyrotron control console"
desc = "Used to control the R-UST stability beams."
icon = 'icons/obj/machines/power/fusion.dmi'
icon_state = "engine"
light_color = COLOR_BLUE

8
code/modules/power/supermatter/supermatter.dm
View File

@@ -171,7 +171,7 @@
/obj/machinery/power/supermatter/proc/announce_warning()
var/integrity = get_integrity()
var/alert_msg = " Integrity at [integrity]%"
var/message_sound = 'sound/ambience/matteralarm.ogg' // VOREStation Edit - Rykka adds SM Delam alarm
var/message_sound = 'sound/ambience/matteralarm.ogg'
if(damage > emergency_point)
alert_msg = emergency_alert + alert_msg
@@ -192,9 +192,9 @@
//Public alerts
if((damage > emergency_point) && !public_alert)
global_announcer.autosay("WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT!", "Supermatter Monitor")
for(var/mob/M in player_list) // VOREStation Edit - Rykka adds SM Delam alarm
if(!istype(M,/mob/new_player) && !isdeaf(M)) // VOREStation Edit - Rykka adds SM Delam alarm
M << message_sound // VOREStation Edit - Rykka adds SM Delam alarm
for(var/mob/M in player_list) // Rykka adds SM Delam alarm
if(!istype(M,/mob/new_player) && !isdeaf(M)) // Rykka adds SM Delam alarm
M << message_sound // Rykka adds SM Delam alarm
admin_chat_message(message = "SUPERMATTER DELAMINATING!", color = "#FF2222") //VOREStation Add
public_alert = 1
log_game("SUPERMATTER([x],[y],[z]) Emergency PUBLIC announcement. Power:[power], Oxygen:[oxygen], Damage:[damage], Integrity:[get_integrity()]")