3f9124133f
Removes ash walker underwear
2016-04-21 03:10:50 -05:00
546ae0383d
Typo fix and notification for ash walker eggs
2016-04-21 01:46:02 -05:00
fae517c1c0
No guns for ash lizards
2016-04-10 19:16:13 -05:00
3b3bdcdb75
Merge pull request #16640 from KorPhaeron/snow_biome
...
Fixes snow biome alarm bolting doors in every ruin
2016-04-06 00:21:21 -05:00
e91a99c882
Lavaland golem shell name and description
2016-04-05 03:32:10 +03:00
64a73a7759
Alarm Fix
2016-04-04 18:26:06 -05:00
a2a554c48a
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
code/game/objects/explosion.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/structures/girders.dm
code/game/objects/structures/grille.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/events/wormholes.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
5c5734b006
More complicated golem name creation
...
Free Golems now have names of the form MATERIAL SURNAME, where SURNAME
tends to be geological terms or rock types. Very occasionally, human
surnames creep in.
2016-03-30 09:38:10 +01: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
84290c21bc
FREE GOLEM
2016-03-25 22:25:18 -05:00
197490e726
FREE GOLEM
2016-03-25 22:10:13 -05:00
5cebe7159b
Golems
2016-03-22 10:53:25 -05:00
312398aa7b
Fixes quotation marks
2016-03-21 23:53:49 -05:00
da66d0b4c7
Fixes cost
2016-03-21 23:51:17 -05:00
1e19926969
Golems
2016-03-21 23:45:47 -05:00
d50bcfa692
Free Golem
2016-03-21 22:12:09 -05:00
03c7990fb1
Fix
2016-03-16 17:36:23 -05:00
9c23649e98
Got a number wrong
2016-03-16 08:15:33 -05:00
a03adbdf15
Exiles
2016-03-15 22:14:23 -05:00
a6e09b1ca4
Fixes ash walkers being invisible
2016-03-15 12:21:01 -05:00
ad0f888f7c
Ash Walkers
2016-03-14 10:23:26 -05:00
8e1a41edc4
Slightly more frequent storms again
2016-03-12 17:20:43 -06:00
1a385d2f2e
Re-adds the gulag
2016-03-12 12:03:53 -06:00
f8ec6b1142
Fixes and tweaks
2016-03-11 08:28:19 -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
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
a690abcf92
Plant Refactor: Seeds
2016-03-04 02:35:51 +03:00
c02ccab8c0
Merge pull request #15758 from AnturK/spawners
...
Refactor of map and corpse spawners.
2016-02-29 23:44:38 -03:00
5edc60ed0a
Unifies corpse spawners
2016-02-25 18:36:16 +01:00
62ce96e20e
Adjacency checks
2016-02-24 13:20:12 -06:00
66689856d3
Span classes
2016-02-24 01:09:53 -06:00
de89460706
Envy
2016-02-23 06:31:40 -06:00
9d208197ba
Sloth
2016-02-23 05:05:11 -06:00
d17d34edc9
Three lavaland ruins
2016-02-23 01:07:06 -06:00
d14a7f2470
Another map
2016-02-15 13:45:16 -06:00
0e6a7b77c8
Seed Vault
2016-02-15 04:06:40 -06:00
5201b77495
Random Ruins
2015-12-19 06:55:50 -06:00
KorPhaeron
Cheridan
LatD
duncathan
Jack Edge
c0
tkdrg
AnturK