Skip to content

Commit

Permalink
Merge pull request #2629 from Giacom/master
Browse files Browse the repository at this point in the history
MiniStation Update
fleure committed Feb 5, 2014
2 parents fd81304 + c676aec commit 26afced
Showing 7 changed files with 2,943 additions and 2,947 deletions.
5,866 changes: 2,923 additions & 2,943 deletions _maps/map_files/MiniStation/MiniStation.dmm

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions _maps/map_files/MiniStation/misc.dm
Original file line number Diff line number Diff line change
@@ -6,6 +6,13 @@ var/datum/map_config/MiniStation = new()
..()
accessable_z_levels = list("1" = 20, "4" = 40, "5" = 40) // Restrict the map to the non-empty z levels, which were all combined in MiniStation

// Enable all headsets by default in MiniStation, we don't worry about spam here.
// Also both heads are in charge of everything, give them all department channels.

/obj/item/device/encryptionkey/heads/New()
..()
// Give all channels and turn everything on
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1)

/obj/item/weapon/paper/generator
name = "paper - 'generator instructions'"
4 changes: 3 additions & 1 deletion _maps/map_files/MiniStation/telecomms.dm
Original file line number Diff line number Diff line change
@@ -5,11 +5,13 @@
/obj/machinery/telecomms/bus/preset_one/ministation
name = "Bus"
autolinkers = list("processor1", "common")
freq_listening = list()

/obj/machinery/telecomms/processor/preset_one/ministation
name = "Processor"

/obj/machinery/telecomms/server/presets/common/ministation
/obj/machinery/telecomms/server/presets/common/ministation/New()
..()
freq_listening = list()

/obj/machinery/telecomms/broadcaster/preset_left/ministation
9 changes: 8 additions & 1 deletion code/game/objects/structures/transit_tubes.dm
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@
// Mappers: use "Generate Instances from Directions" for this
// one.
/obj/structure/transit_tube/station
name = "station tube station"
icon = 'icons/obj/pipes/transit_tube_station.dmi'
icon_state = "closed"
exit_delay = 2
@@ -32,10 +33,15 @@
var/automatic_launch_time = 100
var/cooldown_delay = 30
var/launch_cooldown = 0
var/reverse_launch = 0

var/const/OPEN_DURATION = 6
var/const/CLOSE_DURATION = 6

// Stations which will send the tube in the opposite direction after their stop.
/obj/structure/transit_tube/station/reverse
reverse_launch = 1



/obj/structure/transit_tube_pod
@@ -171,12 +177,13 @@ obj/structure/ex_act(severity)

/obj/structure/transit_tube/station/proc/launch_pod()
for(var/obj/structure/transit_tube_pod/pod in loc)
if(!pod.moving && pod.dir in directions())
if(!pod.moving && turn(pod.dir, (reverse_launch ? 180 : 0)) in directions())
spawn(5)
pod_moving = 1
close_animation()
sleep(CLOSE_DURATION + 2)
if(icon_state == "closed" && pod && launch_cooldown < world.time)
pod.dir = turn(pod.dir, (reverse_launch ? 180 : 0))
pod.follow_tube()

pod_moving = 0
2 changes: 1 addition & 1 deletion code/modules/events/alien_infestation.dm
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
var/list/vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world)
if(temp_vent.loc.z == 1 && !temp_vent.welded && temp_vent.network)
if(temp_vent.network.normal_members.len > 50) //Stops Aliens getting stuck in small networks. See: Security, Virology
if(temp_vent.network.normal_members.len > 40) //Stops Aliens getting stuck in small networks. See: Security, Virology
vents += temp_vent

var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
2 changes: 1 addition & 1 deletion code/modules/events/spider_infestation.dm
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
var/list/vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world)
if(temp_vent.loc.z == 1 && !temp_vent.welded && temp_vent.network)
if(temp_vent.network.normal_members.len > 50)
if(temp_vent.network.normal_members.len > 40)
vents += temp_vent

while((spawncount >= 1) && vents.len)
Binary file modified icons/obj/pipes/transit_tube.dmi
Binary file not shown.

0 comments on commit 26afced

Please sign in to comment.