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

Minor tweaks, Skipjack can now dock at station

Browse Source 
Tried editing communicator.dm and shuttle_controller.dm as their own _vr
files but this might cause problems, I'm not sure.
This commit is contained in:
Spades
2016-05-29 18:04:46 -04:00
parent 0f677c3670
commit c96e66a144
8 changed files with 2303 additions and 2297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/shuttle_controller.dm
View File

@@ -282,13 +282,14 @@ var/global/datum/shuttle_controller/shuttle_controller
"Fore Starboard Solars" = locate(/area/skipjack_station/northeast_solars),
"Fore Port Solars" = locate(/area/skipjack_station/northwest_solars),
"Aft Starboard Solars" = locate(/area/skipjack_station/southeast_solars),
"Aft Port Solars" = locate(/area/skipjack_station/southwest_solars),
"Aft Port Solars" = locate(/area/skipjack_station/southwest_solars), // Vorestation edit
"[station_short] Arrivals Dock" = locate(/area/skipjack_station/southwest_solars),
"Mining Station" = locate(/area/skipjack_station/mining)
)
VS.announcer = "Colony Automated Radar Array"
VS.arrival_message = "Attention. Unidentified object approaching the colony."
VS.departure_message = "Attention. Unidentified object exiting local space. Unidentified object expected to escape Kara gravity well with current velocity."
VS.departure_message = "Attention. Unidentified object exiting local space. Unidentified object expected to escape local gravity well with current velocity." // Vorestation edit
VS.interim = locate(/area/skipjack_station/transit)
VS.warmup_time = 0

3
code/game/area/Space Station 13 areas_vr.dm Normal file
View File

@@ -0,0 +1,3 @@
/area/skipjack_station/docked
name = "\improper Skipjack"
icon_state = "green"

2
code/game/objects/items/devices/communicator/communicator.dm
View File

@@ -499,7 +499,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
comm.visible_message("<span class='notice'>\icon[src] Connecting to [src].</span>")
user << "<span class='notice'>\icon[src] Attempting to call [comm].</span>"
sleep(10)
user << "<span class='notice'>\icon[src] Dialing internally from [station_name()], Kara Subsystem, [system_name()].</span>"
user << "<span class='notice'>\icon[src] Dialing internally from [station_name()], [system_name()].</span>" // Vorestation edit
sleep(20) //If they don't have an exonet something is very wrong and we want a runtime.
user << "<span class='notice'>\icon[src] Connection re-routed to [comm] at [comm.exonet.address].</span>"
sleep(40)

4
code/modules/admin/secrets/random_events/gravity.dm
View File

@@ -24,8 +24,8 @@
if(gravity_is_on)
log_admin("[key_name(user)] toggled gravity on.", 1)
message_admins("<span class='notice'>[key_name_admin(user)] toggled gravity on.", 1)
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.</span>")
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.")
else
log_admin("[key_name(user)] toggled gravity off.", 1)
message_admins("<span class='notice'>[key_name_admin(usr)] toggled gravity off.", 1)
command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.</span>")
command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.")