82786783f4
Merge pull request #16716 from coiax/plant-genes
...
Added a "plant DNA manipulator" to Botany backroom
2016-04-08 16:34:34 -05:00
0465ea35f8
Fixed inaccurate description of design item
2016-04-08 22:25:05 +01:00
d3d4b43e6a
Added plant data disks to Protolathe
...
Print out some botany data disks if they ask nicely.
2016-04-08 10:34:21 +01:00
452577a9dd
Added plant DNA circuit board to imprinter designs
...
As above.
2016-04-08 10:22:46 +01:00
80eb5833e9
Merge pull request #16470 from KorPhaeron/accelerator
...
Laser Cannon Changes
2016-04-07 18:51:18 +02:00
fe73fc2b58
Merge pull request #16664 from erwgd/PortaseederDesign
...
Adds portable seed extractor to protolathe designs
2016-04-06 13:23:40 -05:00
457888ce0b
Merge pull request #16628 from erwgd/AutolatheMakeHydroTools
...
Adds hydroponics tools and shovels to autolathe_designs.dm
2016-04-05 19:35:47 -05:00
3d9c0e3d66
Merge pull request #16584 from MrStonedOne/patch-183
...
Better sleep()s for procs that abuse it
2016-04-05 21:03:30 +02:00
43471f70f7
Merge pull request #16627 from erwgd/AutoLatheMakeToolbox
...
Add toolbox to autolathe_designs.dm
2016-04-05 14:13:46 -04:00
5098a3c884
Made more sleeps use stoplag
...
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
2016-04-05 11:08:28 -07:00
66a12a9233
added portable seed extractor to designs.dm
2016-04-05 18:14:47 +01:00
4f4a52e206
Merge pull request #16583 from KorPhaeron/rd_fix
...
Fixes RD machine speed
2016-04-04 18:07:22 -05:00
529309e6ab
Added hatchet datum to autolathe_designs.dm, formatting in autolathe_designs.dm and hydroitemdefines.dm
2016-04-04 21:20:03 +01:00
1ab2e4a7bd
Added hydroponics tools to autolathe_designs.dm
2016-04-04 15:23:49 +01:00
406b7307cc
added toolbox to autolathe_designs.dm
2016-04-04 14:19:02 +01: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
e632d78846
RD Fix
2016-04-02 11:21:49 -05: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
177c4c18f8
Accelerator Cannon
2016-03-29 00:44:39 -05:00
26bce514d5
GOOF IN CHARGE OF MATH
2016-03-26 06:12:44 -05:00
03198df8a8
removes evil fucking comma from experimentor.dm
...
jesus fuck this thing annoyed me every single god damn time i saw it and i am so glad i am finally removing it
2016-03-19 22:24:03 -07:00
f21d675fbe
Merge pull request #15849 from Core0verload/jetpack
...
Jetpack nerf revert, new jetpack implant
2016-03-17 00:59:23 +00:00
8dfef3b793
fix
2016-03-12 15:07:33 +03:00
9a3276c784
Alien Alloys in RnD
2016-03-12 15:07:32 +03:00
52d91c0cf9
Abductor Tech added to RnD
2016-03-12 15:07:30 +03:00
6b7774a1de
fixes
2016-03-11 09:52:20 +03: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
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
c6932a37e6
Jetpack nerf revert, new jetpack implant
2016-03-04 14:06:12 +03:00
6c9be9c82d
Adds breathing tube implant, changes how heart works, reworks arm-mounted implants
2016-02-25 12:50:45 +03:00
ceb9af945c
Removes typo.
...
Makes Load Template verb get turf after input.
2016-02-20 18:12:20 +01:00
1a59dbaee1
Fixes Experimentor runtime
2016-02-20 15:39:15 +01:00
46597f41f6
Bit more flat
2016-02-14 17:39:44 +01:00
3ec50ed2cf
Simple reliability fix
2016-02-14 12:12:36 +01:00
2bb9ced33f
Merge pull request #15471 from Firecage/fixesbiobags
...
This fixes biobags picking up slime cores/extracts.
2016-02-13 17:25:59 -03:00
fa287ee090
Merge pull request #15146 from Buggy123/patch-13
...
Adds cable coils to autolathe
2016-02-12 21:39:40 -03:00
5788e89ffa
Added cable coils to the autolathe
...
Cable coils will only be built in stacks of 30, at maximum.
Reduced cable coil cost to 1/4 to be more in line with other tool costs.
Reduced cable coil cost to 1/4 to be more in line with other tool costs.
Fixed it not compiling?
Finally got it to compile
Fixes bad code
removed unnecessary /var
Added maxstack var to define custom stack sizes for things
Allowed the autolathe to use custom stack sizes.
Adds correct maxstack values to various stackable objects
2016-02-12 18:17:34 -05:00
96f438552b
This fixes biobags picking up slime cores/extracts.
2016-02-12 21:02:47 +02:00
b62988b284
Switches known_designs/tech to associative list.
2016-02-11 20:25:23 +01:00
eeb96cb7a5
Merge pull request #15360 from neersighted/ionsomething
...
Remove borg jetpack, give them ion thrusters instead
2016-02-10 18:19:13 -06:00
38a4ca4168
Merge pull request #15349 from octareenroon91/autolathe-buff
...
Enables design transfer to autolathe by disk.
2016-02-10 16:39:31 -03:00
38b97120dd
Enables design transfer to autolathe by disk.
...
You can now save a metal-and/or-glass-only design to disk and load it onto an autolathe.
2016-02-10 12:40:41 -06:00
ec6fcc057d
Removes Radio mmi subtype and adds radio to regular MMI
2016-02-10 00:32:41 -08:00
4b455f5ed3
Actual sprites
2016-02-09 17:36:18 -06:00
173387eefc
Remove borg jetpack, give them ion thrusters instead
...
Also clean up jetpack human movement because wow that code was messy
Its still bad but its better (tm)
2016-02-09 14:53:37 -06:00
0bab26452b
Merge remote-tracking branch 'remotes/upstream/master' into The_Mech_Every_CMO_Will_Want
...
Conflicts:
code/game/mecha/equipment/tools/medical_tools.dm
2016-02-08 08:50:44 -06:00
fdec37b76f
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
...
Conflicts:
code/_onclick/hud/alien.dm
code/_onclick/hud/alien_larva.dm
code/_onclick/hud/hud.dm
code/_onclick/hud/human.dm
code/_onclick/hud/monkey.dm
code/_onclick/hud/other_mobs.dm
code/_onclick/hud/robot.dm
code/game/machinery/Sleeper.dm
code/modules/mob/living/carbon/alien/larva/death.dm
code/modules/mob/living/carbon/brain/death.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/monkey/death.dm
code/modules/mob/living/death.dm
code/modules/mob/living/life.dm
code/modules/mob/living/silicon/ai/death.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/living/silicon/ai/login.dm
code/modules/mob/living/silicon/pai/death.dm
code/modules/mob/living/silicon/robot/death.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob_defines.dm
2016-02-06 15:42:13 +01:00
9386602acf
tgui cargo console
...
rewrite awful shuttle/cargo code a lot as well
2016-02-05 17:06:07 -06:00
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
KorPhaeron
Jack Edge
AnturK
Cheridan
Joan Lung
MrStonedOne
erwgd
duncathan
KorPhaeron
PKPenguin321
Remie Richards
c0
AnturK
tkdrg
Buggy123
Firecage
octareenroon91
Shadowlight213
Bjorn Neergaard
GunHog
phil235