583181bc7a
fixes roundstart gas vars; removes asteroid station
2016-03-30 22:51:18 -06:00
09925f6587
fixes indestructible paths
2016-03-29 19:43:33 -06:00
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06:00
3f1375ba39
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomZLevels/Cabin.dmm
_maps/RandomZLevels/beach2.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/templates/lavaland_surface_automated_trade_outpost.dmm
_maps/templates/lavaland_surface_biodome_winter.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
code/controllers/subsystem/air.dm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/nuclear/nuclearbomb.dm
code/game/machinery/computer/arcade.dm
code/game/objects/effects/aliens.dm
code/game/objects/effects/overlays.dm
code/game/objects/items/apc_frame.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/girders.dm
code/game/turfs/simulated.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/mineral_floor.dm
code/game/turfs/simulated/floor/plating.dm
code/game/turfs/simulated/river.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/simulated/walls_reinforced.dm
code/modules/admin/verbs/buildmode.dm
code/modules/atmospherics/environmental/LINDA_turf_tile.dm
code/modules/events/spacevine.dm
code/modules/flufftext/Hallucination.dm
code/modules/holodeck/turfs.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/interactive.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/bot/floorbot.dm
code/modules/mob/living/simple_animal/guardian/guardian.dm
code/modules/mob/living/simple_animal/hostile/hostile.dm
code/modules/mob/mob_movement.dm
code/modules/power/singularity/narsie.dm
code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
b9950c4358
turf/open and turf/closed
2016-03-29 13:38:56 -06:00
f4f7e6f760
Fixes map issues
2016-03-25 00:46:31 -07:00
63d29e7f99
Adds easter bunnies to cabin for easter, removes a bad variable from the map.
2016-03-25 00:41:14 -07:00
93cb1eb0a0
Merge pull request #16033 from KorPhaeron/its_a_beta_they'll_fix_it
...
Lavaland
2016-03-14 16:47:08 -05:00
b5ffef7161
Merge pull request #16085 from KorPhaeron/beach
...
Renames beach hut
2016-03-13 20:15:23 -05:00
5c514e9d45
Merge pull request #16052 from Menshin/cave_cleaning
...
Away missions runtimes fixing
2016-03-13 07:48:51 -05:00
022d4533a2
Beach Hut
2016-03-13 04:10:31 -05:00
2bb3f668c2
Merge
2016-03-12 15:03:57 -06:00
86565471a8
Merge pull request #16039 from hornygranny/patch-1
...
renames beach love shack to comply with lore
2016-03-12 00:58:59 -06:00
173226e718
Removed non existing variables on mining storage suit in caves.dmm.
...
Fixes atmos runtimes on undergroundoutpost45.dmm.
Fixes Snowdin startup runtimes.
2016-03-12 02:14:55 +01:00
2693dedc25
Merge pull request #16002 from KazeEspada/cabinfixes
...
Cabin fixes
2016-03-11 04:21:52 -06:00
4b58841faf
renames beach love shack to comply with lore
2016-03-10 22:30:44 -08:00
12a6205372
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomRuins/SpaceRuins/asteroid4.dmm
_maps/RandomRuins/SpaceRuins/spacebar.dmm
_maps/RandomZLevels/Academy.dmm
_maps/RandomZLevels/beach.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/spacebattle.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/RandomZLevels/wildwest.dmm
_maps/map_files/AsteroidStation/AsteroidStation.dmm
_maps/map_files/BirdStation/BirdStation.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/DreamStation/z5.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/map_files/generic/z5.dmm
_maps/map_files/generic/z6.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
_maps/templates/lavaland_surface_ufo_crash.dmm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/machinery/computer/arcade.dm
code/game/objects/structures/lattice.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/misc_floor.dm
code/game/turfs/simulated/floor/plasteel_floor.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/bot/cleanbot.dm
code/modules/mob/living/simple_animal/bot/mulebot.dm
code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
05c3b2d07b
Test
2016-03-10 22:41:27 -06:00
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
f8860cdca4
Cabin fixes continued.
2016-03-09 19:01:03 -07:00
2f6d99b42a
Updates beach2 to include sand as a baseturf.
2016-03-09 18:42:06 -07:00
70004efa13
Ports the beach away mission from VOREstation. Adds some new tiles to make it look more like ours. Fixes an issue with the bartender spawn.
2016-03-08 14:43:40 -07:00
3c77fbf3d8
Cabin Fixes
2016-03-06 13:17:30 -07:00
1da99d9be8
Merge pull request #15906 from Buggy123/beachfix
...
Fixes the beach away mission.
2016-03-04 21:33:08 -03:00
1ae539e2d1
Merge pull request #15908 from Core0verload/plantrefactor1
...
Plant Refactor: It came from the Conflicts Hell
2016-03-04 01:02:50 -06:00
a690abcf92
Plant Refactor: Seeds
2016-03-04 02:35:51 +03:00
e7292acb80
Uses real floors instead of holofloors.
2016-03-03 17:05:19 -05:00
66b20c2666
Fixes the beach away mission.
2016-03-03 16:54:00 -05:00
ae9e56d21f
Merge pull request #15852 from KazeEspada/Cabin
...
Cabin Away Mission
2016-03-03 22:18:12 +01:00
6d2a95eb43
Moves the mapGenerator to mapGeneratorObj.dm.
...
Cabin was given new carpets, and some fixes.
The snowy map generator now spawns bunnies.
New type of bunny that is not easter related.
Chickens now have support for no eggs.
2016-03-03 13:47:11 -07:00
7bfe258241
Cabin ready for testing commit. Cabin is mostly finished and just needs some eyes to look over it and see if I missed anything.
2016-02-29 22:47:38 -07:00
f1d903dadb
Add fireplace and a map generator. Finishes more the cabin map.
2016-02-28 14:18:08 -07:00
03c168c2b3
Begins work on Cabin away mission. Its a quiet away mission that resembles beach.
2016-02-27 17:36:09 -07:00
5edc60ed0a
Unifies corpse spawners
2016-02-25 18:36:16 +01:00
ba750e34e9
Repaths
2016-02-18 17:56:43 +01:00
30fe8f3d40
Merge pull request #15484 from MMMiracles/smartlocks
...
Spacebattle Rework
2016-02-17 18:30:47 -06:00
e1cb49a55c
Add syndicate faction to snowdin medbot
2016-02-14 08:08:36 +00:00
18b8526d74
makes changes more lore-friendly
2016-02-13 14:17:10 -05:00
252fb9ae39
deletes two whole chairs to fit lore
2016-02-12 21:33:36 -05:00
677971def0
spacebattle rework
2016-02-12 20:15:20 -05:00
80515f1d38
Repath janicarts/secways/atvs
...
Remove the path compability in favor of true pathing
2016-02-12 17:10:00 -06:00
ec6fcc057d
Removes Radio mmi subtype and adds radio to regular MMI
2016-02-10 00:32:41 -08:00
ddab6823d3
Fix up crates
...
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
796cca2753
tgui scrubbers
...
removes area atmos computer
2016-02-05 17:06:02 -06:00
68e1269ea7
Repath thank dispensers; fix ASSteroid station; repath SSU ract
2016-01-25 12:03:13 -06:00
f3697fc7d6
Repath air alarms
2016-01-25 12:02:58 -06:00
dae73b28e8
Refactor atmos_control into only one computer
2016-01-23 18:56:37 -06:00
4c192d705a
Rewrite heaters/freezers; port to tgui
...
They are now one type, thermomachine.
2016-01-22 19:25:35 -06:00
8b13e0cfdd
i love map conflicts
2016-01-21 01:20:25 -05:00
af5f726089
lodesmapedits
2016-01-21 01:07:06 -05:00
duncathan
KazeEspada
Cheridan
KorPhaeron
Menshin
KorPhaeron
hornygranny
tkdrg
c0
Buggy123
AnturK
AnturK
oranges
MMMiracles
Bjorn Neergaard
Shadowlight213