3f833f2b24
Reimplemented floor lights as a machine built at the autolathe.
2015-08-16 19:26:17 -07:00
e875a7ce48
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer3/buildandrepair.dm
code/game/objects/items/devices/lightreplacer.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
0ceb0e291d
Fixes #10314
...
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
0c1aee8074
Fixes <span class='class>, makes Travis check it
2015-07-18 21:13:32 +01:00
f9134028b6
Fixes #9777
2015-06-10 23:14:34 +09:30
c77605265c
code/game/objects, code/game/machinery merge fix
2015-06-02 20:18:45 +01:00
5be2bd6a1b
Updates to properly DA materials
2015-05-23 15:21:11 +03:00
3bdb5ff9ea
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/leather.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/kitchen.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
2015-05-22 19:26:39 +03:00
35a20002c6
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
baystation12.dme
code/defines/obj/weapon.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_parts.dm
code/game/objects/items/devices/flash.dm
code/game/objects/items/devices/powersink.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
code/game/objects/items/weapons/circuitboards/machinery/power.dm
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
code/game/objects/items/weapons/circuitboards/machinery/research.dm
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/handcuffs.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/teleportation.dm
code/game/objects/items/weapons/tools.dm
code/modules/assembly/igniter.dm
code/modules/assembly/infrared.dm
code/modules/assembly/mousetrap.dm
code/modules/assembly/proximity.dm
code/modules/assembly/signaler.dm
code/modules/assembly/timer.dm
code/modules/assembly/voice.dm
code/modules/clothing/glasses/glasses.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/mining/drilling/scanner.dm
code/modules/mining/mine_items.dm
code/modules/mining/ore.dm
code/modules/mob/living/silicon/robot/analyzer.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
4cd2a5a532
Updating stools/stool padding.
2015-05-17 12:53:23 +09:30
ae3ad84634
Updated ashtrays and mineral doors.
2015-05-17 03:02:03 +09:30
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
f4923e2a20
Renamed twohanded weapons, collapsed bats.
2015-05-16 21:12:54 +09:30
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
354859b889
Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks
2015-05-15 04:47:18 +01:00
5f65565f45
Bugfixes, removing the remnants of table_parts, changelog.
2015-05-13 20:40:00 +01:00
4b87799072
New tables, code section. Changelog entry soon.
2015-05-13 19:08:39 +01:00
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
79e3acc95e
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
f3be9b41f0
Ports /vg/'s Nas-Sie remake.
...
First phase: Port cultify procs.
2015-04-11 13:58:08 +02:00
1ba8dcbca9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
20d62c87ff
Borg module fixes
...
Fixes #8775
Fixes #8797
2015-04-10 09:50:47 +03:00
db30c15e4c
Updates to science
...
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03:00
7ab57a4917
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/fancy.dm
code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
6e2488ccb0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
2015-03-20 08:26:34 +01:00
618249131e
Gives more/better comfychair color options. Removes unused icons from objects.dmi.
2015-03-18 00:26:42 -04:00
458970a617
Merge remote-tracking branch 'upstream/dev' into reagent_dispenser
2015-03-16 21:21:56 +00:00
9aed472531
Minor storage cleanup
...
Demotes folding to storage/box, makes doughnut boxes a subtype of box.
Removes a couple of istype() hacks from storage.
2015-03-05 11:08:22 -05:00
c3388020ff
Reagent dispenser rework
2015-03-02 02:25:32 +00:00
81599a9203
Merge pull request #8175 from Kelenius/ofBorgsAndSynths
...
Adds robot synths
2015-02-21 11:43:39 +03:00
a0b73140e9
Fixes for synths and decompiler
2015-02-20 13:32:10 +03:00
1c1e644f29
Adds robot synths
2015-02-19 21:04:27 +03:00
57ffdc82f6
Replaces stool structures with stool items
2015-02-18 01:06:00 -05:00
1c3b1087dd
Merge pull request #7582 from Zuhayr/richard
...
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
5e7133dd08
Converted baseball bats to twohanded weapons.
2015-01-20 19:14:38 +10:30
a76af3c7c5
Fixes #7572
2014-12-30 16:33:34 +10:30
a7f47e32d7
Merge pull request #7534 from mwerezak/doors
...
Doors and stacks
2014-12-28 13:14:23 +10:30
64e26b2dbd
Fixes robot stacks transferability
...
Cleans up transferring between stacks and makes robot stacks
transferable with regular ones.
2014-12-25 15:06:31 -05:00
591fc164de
Updating rack paths to match previous commit.
2014-12-24 12:26:43 +10:30
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
8f342ada74
Constructable blood packs.
...
Can now make your own blood packs from plastic.
2014-12-01 08:40:58 +01:00
cec617a414
Merge resolution, compile fixes with outdated glass paths/map.
2014-11-19 23:17:25 +10:30
af8da7de03
Adjusts glass sheet construction menu input
2014-11-16 22:30:07 -05:00
4090f04839
Readded monkey dexterity checks in each attack_hand as appropriate.
2014-11-13 17:46:37 +10:30
Zuhayr