03067837fa
Merge pull request #16976 from nullbear/grenade-tweaks
...
tiny fixes to my stuff. (Sorry! >~<)
2016-04-22 20:29:53 +10:00
a7c9c80977
tiny fixes to little things
...
allows deconstruction of xenobio computer again.
renames chem grenades to chem grenades.
makes advanced grenades scale up their unit thing.
makes chemical payload scale up with matter bin used in construction,
and more accessible in general
2016-04-22 03:20:47 -07:00
751e309d79
Merge pull request #16959 from LatD/xenobiomonkey
...
Fixes xenobio console breaking with monkey numbers
2016-04-21 02:23:37 -05:00
cc313310d9
Merge pull request #16985 from Core0verload/mecha-plasma-cutter
...
Fixes Mecha Plasma Cutter design
2016-04-20 12:00:55 -05:00
bd5eb1d02b
Merge pull request #16958 from erwgd/AutolatheMakeMilbelts
...
Adds tray to autolathe designs
2016-04-19 16:05:28 -05:00
ba91db5e0c
Mecha Plasma Cutter
2016-04-19 15:58:25 +03:00
9ff553c77f
Forgot to remove one var
2016-04-18 21:07:08 +03:00
a17a9a4b14
Change var to round
2016-04-18 21:06:27 +03:00
b1ed5c18ff
Fix possible but unlikely exploit
2016-04-18 19:49:21 +03:00
6fc6989b9c
Update xenobio_camera.dm
2016-04-18 19:27:28 +03:00
23700e33ff
Added tray datum to autolathe_designs.dm
2016-04-18 10:43:26 +01:00
d671bf573c
Merge pull request #16858 from nullbear/Chemical-Explosives
...
Adds Chemical Explosives
2016-04-18 02:35:56 -05:00
1cb85c3024
Fixes monkey cube Dupe Glitch
...
fixes https://github.com/tgstation/-tg-station/issues/14667
Adds some consistency, allowing monkeys to be drag dropped onto the
monkey recycler, like they are with the disposals chutes.
Prevents grabs from being placed in disposals, as they were being
before.
2016-04-15 21:36:34 -07:00
2f52e7daf9
Merge pull request #16829 from erwgd/LetUsMakeDinnerware
...
New autolathe category for kitchen+bar items
2016-04-14 11:56:21 -05:00
9d6247c890
Removed bowl making code from biogenerator.dm
...
Added bowl design to autolathe_designs.dm
Changed bowl materials to 500 glass
2016-04-14 17:14:01 +01:00
d8a724f1c4
Merge pull request #16806 from coiax/airlock-painter
...
Airlock painter now printable in autolathe; plus meme suicides
2016-04-14 09:29:10 -04:00
df32979866
Adds Chemical Explosives
...
see changelog for details
2016-04-13 13:09:41 -07:00
ca88d3f025
added shot glass and shaker designs to autolathe
...
defined materials for shot glass and shaker
2016-04-13 17:17:15 +01:00
4b7f274e3f
Merge pull request #16742 from Core0verload/master
...
Cargo Exports (and a very basic economy system)
2016-04-13 17:41:05 +02:00
62939a09f0
Merge pull request #16733 from octareenroon91/patch-35
...
Add Drone Shell to Protolathe for ease of exporting drone data disks to autolathes
2016-04-12 23:54:47 -05:00
04f1aafa78
Exports
2016-04-13 06:01:40 +03:00
b0d6771903
Merge pull request #16694 from Fox-McCloud/xenobio-tweaks
...
Xenobio Additions and Tweaks
2016-04-12 20:57:50 -04:00
0078f91d8a
Added hacked autolathe design for butcher cleaver
...
Defined materials for butcher cleaver
2016-04-12 20:01:26 +01:00
f0a6af827e
Added bowl design to biogenerator.dm
...
Added recipes for fork and drinking glass to autolathe_designs.dm
Defined materials for fork, bowl, drinking glass
2016-04-12 19:39:09 +01:00
73be1a80c0
Created Dinnerware category for autolathe
...
Changed category of kitchen knife from "Misc." to "Dinnerware"
2016-04-11 22:19:15 +01:00
115d32a357
Adds airlock painter to autolathe designs
2016-04-11 11:54:45 +01:00
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
00984ac291
Add Drone Shell to Protolathe
...
Drone shell constructable from protolathe
2016-04-07 21:31:25 -05:00
80eb5833e9
Merge pull request #16470 from KorPhaeron/accelerator
...
Laser Cannon Changes
2016-04-07 18:51:18 +02:00
14d611ecc1
Xenobio Additions and Tweaks
2016-04-06 22:36:58 -04: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
Jordie
nullbear
KorPhaeron
Cheridan
c0
LatD
erwgd
Joan Lung
AnturK
Jack Edge
octareenroon91
Fox-McCloud
MrStonedOne
duncathan
KorPhaeron
PKPenguin321