cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-10 21:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Fix 3

Browse Source
This commit is contained in:
Zandario
2020-08-23 00:17:57 -05:00
parent d26f152843
commit df4d3ae5c1
8 changed files with 11 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/materials/material_sheets.dm
View File

@@ -460,7 +460,7 @@
if(istype(W, /obj/item/ore/glass) && !interact(user, src))
if(do_after(user, 3 SECONDS, src) && use(1) && qdel(W))
var/turf/T = get_turf(user)
to_chat(user, "<span class='notice'>You fill the sandbag.</span>")
to_chat(user, "<span class='notice'>You fill the sandbag.</span>")
new /obj/item/stack/material/sandbags && !get(T)
else
return ..()

2
maps/endeavor/submaps/odin5a-desert/odin5a.dm
View File

@@ -17,7 +17,7 @@
/datum/shuttle_destination/excursion/beach
name = "Odin 5a Coastal Landing"
my_area = /area/shuttle/excursion/away_beach
preferred_interim_area = /area/shuttle/excursion/sand_moving
preferred_interim_tag = "tether_excursion_transit_sand"
skip_me = TRUE
routes_to_make = list(

8
maps/nsv_triumph/submaps/poi_d/_class_d.dm
View File

@@ -1,8 +1,8 @@
//Shuttle Path for Class D Worlds
/datum/shuttle_destination/excursion/class_d_orbit
name = "Unknown Planet Orbit" //The name of the destination
my_area = /area/shuttle/excursion/space //The area the shuttle goes when it's settled at this destination
preferred_interim_area = /area/shuttle/excursion/space_moving //The area the shuttle goes while it's moving there
my_landmark = "triumph_excursion_space" //The area the shuttle goes when it's settled at this destination
preferred_interim_tag = "triumph_excursion_transit_space" //The area the shuttle goes while it's moving there
skip_me = TRUE //Must be TRUE on all away-mission destinations for reasons
routes_to_make = list( //These are routes the shuttle connects to,
@@ -11,8 +11,8 @@
/datum/shuttle_destination/excursion/class_d_surface
name = "Unknown Planet Surface"
my_area = /area/shuttle/excursion/poi_d
preferred_interim_area = /area/shuttle/excursion/sand_moving
my_landmark = "triumph_excursion_poid"
preferred_interim_tag = "tether_excursion_transit_sand"
skip_me = TRUE
routes_to_make = list(

6
maps/nsv_triumph/submaps/space/_debrisfield.dm
View File

@@ -1,8 +1,8 @@
// -- Datums -- //
/datum/shuttle_destination/excursion/debrisfield
name = "Debris Field"
my_area = /area/shuttle/excursion/debrisfield
preferred_interim_area = /area/shuttle/excursion/space_moving
my_landmark = "triumph_excursion_debrisfield"
preferred_interim_tag = "triumph_excursion_transit_space"
skip_me = TRUE
routes_to_make = list( //These are routes the shuttle connects to,
@@ -64,4 +64,4 @@
/area/triumph_away/debrisfield/derelict
icon_state = "debrisexplored"
forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg')
forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg')

9
maps/nsv_triumph/triumph_shuttles.dm
View File

@@ -32,13 +32,6 @@
var/frequency = 1380 // Why this frequency? BECAUSE! Thats what someone decided once.
var/datum/radio_frequency/radio_connection
/datum/shuttle/autodock/ferry/emergency/init_docking_controllers()
docking_controller_tag = null
landmark_station = null
landmark_offsite = null
radio_connection = radio_controller.add_object(src, frequency, null)
..()
/datum/shuttle/autodock/ferry/emergency/dock()
..()
// Open Doorsunes
@@ -227,7 +220,7 @@
name = "NSV Triumph Excursion Hangar"
my_landmark = /area/shuttle/excursion/triumph
dock_target = "expshuttle_dock"
//dock_target = "expshuttle_dock"
radio_announce = 1
announcer = "Excursion Shuttle"

2
maps/tether/submaps/beach/_beach.dm
View File

@@ -15,7 +15,7 @@
/datum/shuttle_destination/excursion/beach
name = "Remote Coastal Area"
my_area = /area/shuttle/excursion/away_beach
preferred_interim_area = /area/shuttle/excursion/sand_moving
preferred_interim_tag = "tether_excursion_transit_sand"
skip_me = TRUE
routes_to_make = list(

7
maps/tether/tether_shuttles.dm
View File

@@ -32,13 +32,6 @@
var/frequency = 1380 // Why this frequency? BECAUSE! Thats what someone decided once.
var/datum/radio_frequency/radio_connection
/datum/shuttle/autodock/ferry/emergency/init_docking_controllers()
docking_controller_tag = null
dock_target_station = null
dock_target_offsite = null
radio_connection = radio_controller.add_object(src, frequency, null)
..()
/datum/shuttle/autodock/ferry/emergency/dock()
..()
// Open Doorsunes

23
vorestation.dme
View File

@@ -3518,29 +3518,6 @@
#include "interface\stylesheet.dm"
#include "interface\skin.dmf"
#include "maps\nsv_triumph\triumph.dm"
#include "maps\nsv_triumph\triumph_areas.dm"
#include "maps\nsv_triumph\triumph_areas2.dm"
#include "maps\nsv_triumph\triumph_defines.dm"
#include "maps\nsv_triumph\triumph_phoronlock.dm"
#include "maps\nsv_triumph\triumph_shuttle_defs.dm"
#include "maps\nsv_triumph\triumph_shuttles.dm"
#include "maps\nsv_triumph\triumph_telecomms.dm"
#include "maps\nsv_triumph\triumph_things.dm"
#include "maps\nsv_triumph\triumph_turfs.dm"
#include "maps\nsv_triumph\triumph_virgo3b.dm"
#include "maps\nsv_triumph\submaps\_triumph_submaps.dm"
#include "maps\nsv_triumph\submaps\admin_use\fun.dm"
#include "maps\nsv_triumph\submaps\gateway\carpfarm.dm"
#include "maps\nsv_triumph\submaps\gateway\listeningpost.dm"
#include "maps\nsv_triumph\submaps\gateway\snow_outpost.dm"
#include "maps\nsv_triumph\submaps\gateway\snowfield.dm"
#include "maps\nsv_triumph\submaps\gateway\zoo.dm"
#include "maps\nsv_triumph\submaps\poi_d\_class_d.dm"
#include "maps\nsv_triumph\submaps\poi_d\_templates.dm"
#include "maps\nsv_triumph\submaps\poi_d\D_world_things.dm"
#include "maps\nsv_triumph\submaps\space\_debrisfield.dm"
#include "maps\nsv_triumph\submaps\space\_templates.dm"
#include "maps\nsv_triumph\submaps\space\debrisfield_things.dm"
#include "maps\RandomZLevels\blackmarketpackers.dm"
#include "maps\RandomZLevels\carpfarm.dm"
#include "maps\RandomZLevels\listeningpost.dm"