LordFowl
51fc044d46
Starting to fix BayMerge up
2017-01-27 17:47:24 -05:00
LordFowl
471ef657d5
Merge branch 'Aurorastation/development' into Map-Development
...
# Conflicts:
# code/TriDimension/controller_presets.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/crates_lockers/closets/wardrobe.dm
# code/game/objects/structures/signs.dm
# code/game/turfs/simulated/floor_types.dm
# code/modules/random_map/mining_distribution.dm
# code/modules/random_map/random_map.dm
# code/world.dm
# icons/obj/barsigns.dmi
# icons/obj/decals.dmi
# icons/obj/plants.dmi
# icons/obj/structures.dmi
# icons/turf/floors.dmi
# icons/turf/wall_masks.dmi
# maps/exodus-2.dmm
2017-01-27 01:57:29 -05:00
SoundScopes
f45d6ce71b
Still adding lifts
2017-01-25 17:19:35 +00:00
SoundScopes
ee07b5faf5
Adding lifts
2017-01-25 17:19:16 +00:00
LordFowl
5ccb627531
BayMerge Bugfix; Fixing guns, update computers. ( #1263 )
...
Fixes all the snowflake guns unique to our codebase with multiple firemodes so that they now actually behave correctly. Fixes a few bugs relating to computers, and updates modular_computers to use holoscreens.
2016-12-21 21:48:04 +02:00
SoundScopes
97bb1e8e38
Travis: Indentation / list fixes ( #1254 )
...
Fixes the tools/indentation.awk script to not demand a comma at the end of perfectly valid comments.
Makes it report unnecessary commas in lists.
Readds it to the Travis build list.
2016-12-19 16:40:52 +02:00
Zuhayr
ba6d684e96
Adds [dock_name] entry used by shuttles.
...
Conflicts:
code/controllers/emergency_shuttle_controller.dm
code/global.dm
code/modules/shuttles/shuttle_emergency.dm
2016-01-14 08:33:22 +01:00
PsiOmegaDelta
89e85925c9
Merge pull request #11516 from Baystation12/dev-freeze
...
Dev
2015-11-24 14:35:56 +01:00
PsiOmegaDelta
e67ff9e903
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-24 14:02:15 +01:00
PsiOmegaDelta
782f0a8bfb
Makes shuttle control consoles sturdier.
...
Fixes #11501 .
2015-11-22 11:37:14 +01:00
PsiOmega
e48fbdd1e6
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/newscaster.dm
code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
PsiOmegaDelta
5fbe0819b7
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/Sleeper.dm
2015-08-17 13:05:58 +02:00
PsiOmegaDelta
e1aa05be02
Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates
...
Conflicts:
code/game/machinery/computer/security.dm
2015-07-28 09:16:34 +02:00
PsiOmegaDelta
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +02:00
Zuhayr
c779482afc
Merge with dev.
2015-07-15 16:20:39 +09:30
mwerezak
0b2b475be4
Adds lights to ERT shuttle, ERT ready light
...
Fixes #10155
2015-07-12 18:41:24 -04:00
PsiOmegaDelta
87d4cf4f68
Computers are now overlay based.
...
Computers now use an overlay based system, instead of demanding a full set of icons (on, off, broken) for every different computer.
Partially ports ParadiseSS13/Paradise#1468 which is a port of tgstation/-tg-station#9931 .
2015-07-07 17:23:49 +02:00
PsiOmega
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
PsiOmega
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
mwerezak
c6c200c127
Fixes #9251
2015-06-26 01:38:04 -04:00
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
mwerezak
80c80abe3a
Fixes #9511
2015-06-21 03:00:37 -04:00
PsiOmegaDelta
cc7c502fb8
Updates emag attackby usages to emag_act where it's not too much of a headache.
2015-06-16 09:34:13 +02:00
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
GinjaNinja32
9546c8a5e1
Better shuttle override logging, span classes, \The, GetID() instead of typechecks
2015-05-29 18:31:21 +01:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
mwerezak
fbd1ddade4
Adds refresh button, fixes arrivals docking frequency.
2015-04-02 00:26:45 -04:00
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
PsiOmega
318f5e1a92
Cleans up access handling.
2015-03-02 18:55:03 +01:00
PsiOmega
e7653e1ed5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-26 08:22:25 +01:00
mwerezak
6d15809768
Corrects return values for the Topic procs of several computers and some other machines as well.
2015-02-25 21:32:35 -05:00
Atlantiscze
7aa3949621
Removes redundant checks.
2015-02-09 19:37:00 +01:00
Atlantiscze
8160c9538f
Shuttle Power Compatibility
...
- Shuttles may now contain power cables/machines such as SMESs and cables.
2015-02-09 00:22:52 +01:00
Atlantiscze
07b5b7af8b
Updates references
...
- Changed referenced to old blastdoor type to new type, removing compile errors
- Fixes small issue in blast door file which caused compile error
2014-12-27 00:03:20 +01:00
Amunak
158573f066
Corrects names of computers, code formatting, updated computer descriptions.
...
Everything in game/machinery/computers/ and modules/shuttles should now have properly (de)capitalized names. Computer, board and research names should now be coherent, too. Adds a research for employment records circuit board.
2014-12-14 05:00:38 +01:00
Zuhayr
3c66bd3920
Merge resolution.
2014-12-08 13:01:04 +10:30
mwerezak
550e5f63ea
Makes forced launch handled by shuttle/process()
...
Forced launches are now run by the shuttle controller through process()
instead of in a separate 'thread' launched from the ui.
2014-12-06 18:07:21 -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
ccomp5950
bec21da0cd
AI's no longer able to use specop's shuttle console.
...
Keeps naughty AI's from launching it early.
2014-11-12 23:37:25 -05:00
PsiOmega
66483cf6dd
Completes the transfer to the refreshed announcement system.
2014-10-07 13:19:20 +02:00
Zuhayr
305416d5c5
Merg resolution.
2014-10-02 02:33:06 +09:30
mwerezak
d81670edfb
Fixes supply shuttle state when returning
...
When returning to centcom, the supply shuttle's state was not being set
to INTRANSIT.
2014-10-01 00:48:16 -04:00
Zuhayr
772715f2da
Merged dev-freeze into master. Two map conflicts, used dev-freeze map.
2014-08-27 20:46:04 +09:30
Zuhayr
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
mwerezak
f1a1162c3f
Fixes shuttle ETA given before arrive_time is set
2014-08-24 22:43:19 -04:00
Chinsky
871456f131
Merge pull request #6084 from PsiOmegaDelta/MoreNounce
...
Announcement Refactoring
2014-08-21 21:53:03 +04:00
