6eb4ffa825
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
...
Conflicts:
code/game/objects/items/devices/lightreplacer.dm
code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
4686f80b39
fixes horrible runtimes
2016-04-25 10:20:27 -06:00
27bc533def
fixes air bugs with the maploader changeturf, hopefully
2016-04-25 09:43:10 -06:00
61ddd6797d
Merge pull request #16969 from YotaXP/tgm-maploader
...
[DNM] Updates the map loader to support TGM style map files
2016-04-25 09:28:26 -06:00
fcf544283d
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
...
Conflicts:
code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
0caa59b21a
First commit of this big PR
...
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
6a2820b12d
Names of loaded ruins maps are saved in world log
2016-04-23 06:56:58 +03:00
a86519ecc4
Adds animal hospital ruin
2016-04-19 04:29:14 -05:00
2072670afd
Clean up magic numbers.
2016-04-18 18:28:44 -04:00
0d8cc8aee7
Make the loader use ChangeTurf() for turfs.
2016-04-18 17:41:05 -04:00
03d38bf895
Adds a 'measureOnly' mode to the maploader code for templates.
2016-04-18 16:04:35 -04:00
a1fac08dfd
Modified map loader to be able to read TGM format maps, and cache stuff for SPEED!
2016-04-18 16:04:34 -04:00
5160486e3f
Removes 509 support.
2016-04-16 02:16:19 -07:00
efa8f1b43a
Merge pull request #16836 from Incoming5643/okokfinestopasking
...
(space) ruins requests and practicalities
2016-04-13 21:16:08 -05:00
6ec39db02a
Ruins are now unique, you won't find two of the same one in the same round.
...
The configurable portion of ruin selection is now a blacklist instead of a whitelist.
Moves Lavaland files to be consistent with Space files.
All ruins are now valid for the sake of template generation (previously lava ones were but space ones weren't.
2016-04-12 17:13:41 -04:00
9635648aeb
Improve ruins spawn logging
...
Because `Ruins marker placed at 1761835` isn't that clear.
2016-04-11 21:58:08 -05:00
a6db6f0d1a
Adds a cryostorage version of the ghost spawner. ( #16466 )
...
* Adds An infinitely reusable version of the mob spawner.
* uses
* Fixes
* updates a comment.
2016-04-10 15:42:54 +10: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
721e3ba1a5
Ghost nullspace
2016-03-26 13:26:34 -05:00
63d29e7f99
Adds easter bunnies to cabin for easter, removes a bad variable from the map.
2016-03-25 00:41:14 -07:00
d4a5d61ea5
Minor tweak and fixes to subsystem logic
...
-only process roundstart spawners when they're needed
-use the same method to call atom_spawners for template loading.
Assuming user is adding to the appropriate process list, this will not
cause issues
2016-03-19 22:41:38 +00:00
f9e6e2bca7
Add subsystem for safely spawning atoms at roundstart
...
This system is called just before initialize and does not use a world
loop, so it is safe to spawn and create new atoms.
Any atom can inherit this behaviour by overriding the
spawn_atom_to_world proc and spawning atoms there at roundstart
Make sure you register the atom in question to the list of spawner atoms
by doing SSobj.atom_spawners += src, and then remove when you are done
spawning objects
2016-03-19 22:41:38 +00:00
71ae9d13aa
Adds lag checks to massedit, sdql2, del-all, and the map loader
2016-03-15 03:39:42 -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
745538b397
Legion bodies are damaged
2016-03-14 16:14:11 -05:00
ad0f888f7c
Ash Walkers
2016-03-14 10:23:26 -05:00
3af2b0c447
Re-arranges gulag a bit
2016-03-13 04:00:37 -05:00
6f504014b3
fix template loading runtimes
2016-03-13 01:51:10 +00:00
2bb3f668c2
Merge
2016-03-12 15:03:57 -06:00
1692d5a01d
Merge pull request #16022 from AnturK/ruin_fix
...
Fixes ruins repeating
2016-03-12 13:50:12 -06:00
1a385d2f2e
Re-adds the gulag
2016-03-12 12:03:53 -06:00
9d6752ad78
Merge pull request #16024 from ChangelingRain/notsostellargate
...
All of the bottom gateway parts are passable
2016-03-12 02:28:45 +03:00
2693dedc25
Merge pull request #16002 from KazeEspada/cabinfixes
...
Cabin fixes
2016-03-11 04:21:52 -06:00
31eae7bb26
More fixes
2016-03-11 00:54:49 -06: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
733e157ae7
All of the bottom gateway parts are passable
2016-03-10 16:03:43 -05:00
3819065beb
Merge pull request #15980 from KazeEspada/beach2
...
Virgo Orbital Research Establisment Station Port.
2016-03-10 14:33:48 -06:00
9531ff401a
Fixes ruins repeating
2016-03-10 18:13:49 +01: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
08bdcc3024
Plant Refactor 4
2016-03-07 12:46:12 +03:00
3c77fbf3d8
Cabin Fixes
2016-03-06 13:17:30 -07: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
c02ccab8c0
Merge pull request #15758 from AnturK/spawners
...
Refactor of map and corpse spawners.
2016-02-29 23:44:38 -03: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
phil235
duncathan salt
phil235
c0
Cheridan
YotaXP
MrStonedOne
Cheridan
Incoming
octareenroon91
Shadowlight213
KorPhaeron
KazeEspada
oranges
xxalpha
Razharas
KorPhaeron
Nerd Lord
AnturK
AnturK
tkdrg