duncathan
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06:00
duncathan
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
duncathan
b9950c4358
turf/open and turf/closed
2016-03-29 13:38:56 -06:00
MrStonedOne
09fb8c2b10
Explosions and singulo use spiral range (and other changes)
2016-03-15 03:39:41 -07:00
duncathan
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
duncathan
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
KazeEspada
4a0fa13ed7
Forgot a file.
2016-03-03 13:50:16 -07:00
AnturK
56d2a34201
Splits beds and chairs
...
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
Bjorn Neergaard
063dd9fb84
Get the code running on 510
...
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
duncathan
9066bc7c4f
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
code/controllers/subsystem/air.dm
code/datums/gas_mixture.dm
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/life.dm
tgui/assets/tgui.css
tgui/assets/tgui.js
tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
KorPhaeron
b96bec5157
River Generation Module
...
This is going to be used for lava rivers in lavaland.
2016-01-09 12:06:55 -03:00
duncathan
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
AnturK
711abc4ecf
Adds two CA mapGenerators
2015-12-17 11:45:27 +01:00
AnturK
b14e9133d2
Academy Update
2015-11-28 12:35:41 +01:00
phil235
9c79257aab
Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
...
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
Firecage
4688c2c969
Fixes proc arguments
2015-07-15 23:52:35 +02:00
xxalpha
e7a90863b7
Repath grass.
2015-07-08 02:06:14 +01:00
AnturK
3a5745b505
Updates paths
2015-06-03 22:52:39 +02:00
AnturK
d43e8320b2
Adds area generators to build mode
...
Adds two generators : Asteroid and Syndicate
Syndicate templates
Finish syndicate templates
Moves border and repressurize to helpers.dm
Repressurize generator
Shuttle generator
Buildmode now resets the corners when switching modes/generators
2015-06-03 21:57:11 +02:00
Aranclanos
e7c0d7e95c
Removes unsimulated turfs.
...
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
Remie Richards
a5f39d1cb8
minor correction.
2015-05-03 23:39:04 +01:00
Remie Richards
5e41b790d0
Fixes centerX and centerY not being correctly centered, corrects sphere logic.
...
why is it called sphereMagic? because as far as I'm concerned, it is magic, it was previously named centerZ but it actually was quite a ways off being the center of any spheres. Idk what it does, but It serves a vital part of building mathematically correct spheres.
2015-05-03 23:34:05 +01:00
Remie Richards
96758cb2f7
Fixes the nature generator verb failing to recognise CLUSTER_CHECK_NONE as a valid flag
2015-05-01 16:36:05 +01:00
Remie Richards
74574a29bc
Fixes the scope of the 4 Continue statements to correctly end the turfPath and atomPath loops, Corrects define bitflags
2015-05-01 08:13:47 +01:00
Remie Richards
bdfa5684c3
Adjusts some code to reduce the rapid increase of clustering accidentally somehow caused in this improvement PR
2015-05-01 05:05:32 +01:00
Remie Richards
d88363c66c
Fixes atoms not spawning, Corrects defineCircularRange() to produce proper spheres when given differing Z coords.
2015-05-01 04:27:14 +01:00
Remie Richards
c7f0bc0922
Made defineRegion() procs additive instead of overwriting, overwriting has been moved to a "replace" argument, adds undefineRegion() which makes the map list a new list.
2015-05-01 01:38:39 +01:00
Remie Richards
1808b19933
Fixes a bug where turf cluster checks checked for atoms instead of turfs, adds proc to define a circular region, CIRCLES!
2015-05-01 01:26:28 +01:00
Remie Richards
9402d8c20c
Removes 2 commented out lines.
2015-02-15 14:01:45 +00:00
Remie Richards
4bebfaefc3
Procedural Map Generator System
2015-02-15 12:08:02 +00:00
