Neerti
0618dafb42
Removes the Icarus, as they're realllllly far away now.
2016-03-31 22:33:51 -04:00
Neerti
51552a8bdd
Clarification on mercenary shuttle approaching message, and fixes typo on text when the drone event ends.
2015-12-22 05:03:57 -05:00
Neerti
451c477e4c
Tweaks event text to fit with the lore better.
...
Adds more informative text for vending machines.
Removes RNG viruses.
2015-12-21 04:01:05 -05:00
Neerti
2c81761494
Removes most references to NSS Exodus.
2015-12-03 13:47:37 -05:00
Neerti
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
GinjaNinja32
894b559e29
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-19 07:04:40 +01:00
mwerezak
b361f9ad12
Fixes #10723
2015-08-18 10:28:06 -04:00
mwerezak
7c8c42137e
Fixes #10680
2015-08-18 02:54:13 -04:00
PsiOmegaDelta
55bc41241f
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/setup.dm
2015-08-17 09:37:49 +02:00
mwerezak
524548cc95
Fixes #10680
2015-08-16 14:58:27 -04:00
Neerti
94a2ec5bf1
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2
...
Conflicts:
.travis.yml
polaris.dme
2015-07-26 16:01:27 -04:00
PsiOmega
34b0517578
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/topic.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/nano/modules/atmos_control.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
2015-07-17 23:19:34 +02:00
PsiOmega
b4d15ceb6e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/inventory.dm
2015-07-17 23:09:24 +02:00
PsiOmega
4aa11441cc
Fixes #10212 .
...
NSV Icarus is now NDV Icarus.
2015-07-16 20:32:56 +02:00
Woodrat
62ddc29194
Fixed transfer and Escape Shuttle.
...
- Added more lights and cameras
- Fixed the outposts
- Started work on medical
2015-07-13 16:26:29 -07:00
Woodrat
c5b30257f7
Neerti is Satan, updates map. Updates files.
2015-07-07 20:31:00 -07:00
SledgeLP
6be647c9e4
Fixing namings for Shuttle targets
...
Changing of the offsite location names for the mining and research outpost docks to match the outpost Z level names.
2015-07-06 23:33:06 -05:00
Zuhayr
ebe62cefd8
Refactored random map generator system and added several terrain generators.
...
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
2015-06-03 04:36:19 +09:30
mwerezak
7366df388b
Merge remote-tracking branch 'upstream/dev' into docking-update
2015-03-31 20:50:02 -04:00
mwerezak
2d3a767489
Allows mult-shuttles to use docking controllers and adds docking to the merc shuttle
2015-03-24 03:55:06 -04:00
mwerezak
014692269c
Greatly simplifies docking initialization
2015-03-23 23:35:35 -04:00
Zuhayr
8d698f0c06
First pass on making heist a pirate mode (human based)
2015-03-21 11:13:05 +10:30
Atlantiscze
12be20ed73
Mapping changes preparation
...
- Adds Red and Blue simple pipes for mapping use.
- Adds empty CO2 PH and N2O canisters for mapping use.
- Reworks asteroid outpost areas. Old areas kept in separate file for downstream compatibility
- Modifies engineering shuttle to work with next commit.
- SMESs no longer have to be charged above certain level (~5%?) to actually begin outputting power.
- Fixes SMES related bug caused by previous commit
2015-02-09 18:53:02 +01:00
mwerezak
5b1f7695e3
Remaps the nuke ops shuttle for station docking
...
Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch.
Drops the viro/xenobio docking arm.
Adds a button so that the teleporter blast door can be operated
independently of the airlock blast door.
Fixes some leftover arrivals area just hanging around in space.
Adds a poster specifically for the nuke ops shuttle.
2014-12-05 01:17:17 -05:00
Atlantiscze
0fda5bf9b8
Nukeops shuttle docking
...
- Nukeops (or newly mercenaries) can now dock with the station. Two locations are available, maintenance between virology and xenobiology and arrivals.
- You always have to hack in or be let in. The door won't open on it's own. This is intentional as the shuttle is considered unrecognised by station's docking system. AI or anyone else can open the doors for you if needed.
- Also fixes bug which broke the shuttle console, since someone who was renaming nukeops to mercenaries forgot to change one line in antagonist.dm
2014-11-29 03:51:45 +01:00
Zuhayr
99ff852e46
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-19 16:05:40 +10:30
mwerezak
8388ecb94a
Allows escape pods to be armed from inside the pod
2014-07-01 21:55:37 -04:00
mwerezak
1cc840dccc
Adds the ability to force launch escape pods
...
Also reduces their countdown from 15 to 10 seconds.
2014-06-28 19:40:18 -04:00
mwerezak
7ae03d127b
Fixes macro escape slashes
...
Derp.
2014-06-26 20:48:07 -04:00
mwerezak
363df869e2
Improves the fix for shuttles being stuck if...
...
... the docking controller is destroyed.
2014-06-26 19:01:17 -04:00
mwerezak
96e584d517
Adds escape pod docking controllers
2014-06-25 13:08:22 -04:00
mwerezak
d5c5d4b21f
Adds escape pod docking controller type
...
Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.
Also fixes emergency shuttle arrival announcement having the wrong ETD.
2014-06-25 12:32:12 -04:00
mwerezak
717a697fe2
Adds escape shuttle docking controllers
2014-06-25 00:21:52 -04:00
mwerezak
e7aef647c2
Fixes #5351
...
Multi-shuttle origin was being assigned a path, not an actual area.
2014-06-24 18:03:45 -04:00
mwerezak
d892099ea3
Adds direction arg for area/move_contents_to()
...
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays
2014-06-23 23:51:47 -04:00
mwerezak
e17b8bffab
Replaces the emergency shuttle control console
...
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.
2014-06-23 22:01:21 -04:00
mwerezak
9e0562b16c
Adds shuttle controller
...
Moves all ferry shuttle processing into one place: the new shuttle
controller.
Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
2014-06-23 22:00:57 -04:00
mwerezak
81f0f868b4
Minor shuttle fixes and cleanup
...
Readds the missing "shuttle has left the station" message, improves the
ETA calculation and reorganizes the procs in shuttle_controller.dm
2014-06-23 01:55:43 -04:00
mwerezak
71351bd285
Some fixes
2014-06-22 20:40:08 -04:00
mwerezak
b0cc1f6789
Forgot to process shuttles
2014-06-22 18:36:43 -04:00
mwerezak
caece105dc
Adds escape pods to the controller
2014-06-22 18:19:07 -04:00
mwerezak
dc304026a9
shuttle_controller now uses a shuttle datum
2014-06-22 18:10:56 -04:00
mwerezak
b4bb8ab31d
Reworks shuttles to be more extensible
...
Kudos to Zuhayr for laying the groundwork for this.
2014-06-09 23:41:29 -04:00
mwerezak
0319c96502
Adds docking support to shuttles, NanoUI
2014-06-09 23:41:08 -04:00
Jeremy Liberman
c607872b80
Mutiny fix prereqs for directives
2014-05-25 14:20:37 -05:00
Jeremy Liberman
d23340a49b
Mutiny Mode
2014-05-11 15:03:50 -05:00
Kilakk
2eae729426
Absolute paths for shuttle controller
2013-08-04 00:19:37 -04:00
Kilakk
603fa03826
Shuttle doors will now close and lock upon departure
2013-08-03 23:39:51 -04:00
Mloc-Argent
08393161c0
Merge branch 'master' into BEF-staging
...
Conflicts:
config/config.txt
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-04 13:08:28 +01:00
