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

Fixes blue, removes commented out code, gives file a meaningful name.

Browse Source
This commit is contained in:
Yoshax
2015-04-07 13:54:22 +01:00
parent 8893cb89d8
commit bb9a418ed0
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
baystation12.dme
View File

@@ -314,10 +314,10 @@
#include "code\game\machinery\bees_items.dm" #include "code\game\machinery\bees_items.dm"
#include "code\game\machinery\biogenerator.dm" #include "code\game\machinery\biogenerator.dm"
#include "code\game\machinery\bioprinter.dm" #include "code\game\machinery\bioprinter.dm"
#include "code\game\machinery\bluespacerelay.dm"
#include "code\game\machinery\buttons.dm" #include "code\game\machinery\buttons.dm"
#include "code\game\machinery\cell_charger.dm" #include "code\game\machinery\cell_charger.dm"
#include "code\game\machinery\cloning.dm" #include "code\game\machinery\cloning.dm"
#include "code\game\machinery\commsbantenna.dm"
#include "code\game\machinery\constructable_frame.dm" #include "code\game\machinery\constructable_frame.dm"
#include "code\game\machinery\cryo.dm" #include "code\game\machinery\cryo.dm"
#include "code\game\machinery\cryopod.dm" #include "code\game\machinery\cryopod.dm"

34
code/game/machinery/bluespacerelay.dm Normal file
View File

@@ -0,0 +1,34 @@
/obj/machinery/bluespacerelay
name = "Emergency Bluespace Relay"
desc = "This sends messages through bluespace! Wow!"
icon = 'icons/obj/stationobjs.dmi'
icon_state = "bspacerelay"
anchored = 1
density = 1
use_power = 1
var/on = 1
idle_power_usage = 15000
active_power_usage = 15000
/obj/machinery/bluespacerelay/process()
update_power()
update_icon()
/obj/machinery/bluespacerelay/update_icon()
if(on)
icon_state = initial(icon_state)
else
icon_state = "[initial(icon_state)]_off"
/obj/machinery/bluespacerelay/proc/update_power()
if(stat & (BROKEN|NOPOWER|EMPED))
on = 0
else
on = 1

11
code/game/machinery/computer/communications.dm
View File

@@ -48,9 +48,7 @@
/obj/machinery/computer/communications/Topic(href, href_list) /obj/machinery/computer/communications/Topic(href, href_list)
if(..()) if(..())
return 1 return 1
//if (src.z > 1)
// usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
// return
usr.set_machine(src) usr.set_machine(src)
if(!href_list["operation"]) if(!href_list["operation"])
@@ -194,7 +192,7 @@
if(!input || !(usr in view(1,src))) if(!input || !(usr in view(1,src)))
return return
Centcomm_announce(input, usr) Centcomm_announce(input, usr)
usr << "<span class='notice'>blue Message transmitted.</span>" usr << "<span class='notice'>Message transmitted.</span>"
log_say("[key_name(usr)] has made an IA Centcomm announcement: [input]") log_say("[key_name(usr)] has made an IA Centcomm announcement: [input]")
centcomm_message_cooldown = 1 centcomm_message_cooldown = 1
spawn(300)//30 second cooldown spawn(300)//30 second cooldown
@@ -211,7 +209,7 @@
if(!input || !(usr in view(1,src))) if(!input || !(usr in view(1,src)))
return return
Syndicate_announce(input, usr) Syndicate_announce(input, usr)
usr << "<span class='notice'>blue Message transmitted.</span>" usr << "<span class='notice'>Message transmitted.</span>"
log_say("[key_name(usr)] has made an illegal announcement: [input]") log_say("[key_name(usr)] has made an illegal announcement: [input]")
centcomm_message_cooldown = 1 centcomm_message_cooldown = 1
spawn(300)//10 minute cooldown spawn(300)//10 minute cooldown
@@ -282,9 +280,6 @@
/obj/machinery/computer/communications/attack_hand(var/mob/user as mob) /obj/machinery/computer/communications/attack_hand(var/mob/user as mob)
if(..()) if(..())
return return
//if (src.z > 6)
// user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
// return
user.set_machine(src) user.set_machine(src)
var/dat = "<head><title>Communications Console</title></head><body>" var/dat = "<head><title>Communications Console</title></head><body>"