Commit Graph

16 Commits

Author SHA1 Message Date
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
ComicIronic
06b5e60bbe Material datum implementation
Material datum functionality changed to mimic that of reagents etc. by
using a global datum list and an assoc value list.
Material datums added at the atom level.
starting_materials var added - on New(), the materials in the list are
added to a datum. An empty list generates an empty datum, a null means no
datum.
m_amt, g_amt, and where applicable gold_amt, etc. completely removed,
replaced with starting_materials where applicable.

Fabricators
Fixed a bug with fabricators taking design cost, not shown cost.
Fixed a bug with fabricators taking costs before a design was shown
completable.
Fabricators now transfer the materials they use in the design to the atom
produced's material datum.
Designs are now world-consistent : scanning the same atom will ref the
same design, and scanning an atom with a design will fetch it.
Mechanic fabs now add plastic cost on top of the design, not to it.
Mechanic designs no longer require random extra materials.
Mechanic designs are now material-specific, not type-specific.
Mechanic blueprint uses have been removed, in favour of a consumable
system.
RnD wires moved to the datum system.
Autolathe moved under fabricators. It preserves as much functionality as
possible.
Framework added for plastic costs on mechanic fabs to be toggled, and for
removal of designs to be toggled also.
2015-06-13 16:13:02 +01:00
D3athrow
01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
2015-04-12 16:40:59 -05:00
ComicIronic
d0e9eedd25 drop_item and click code.
drop_item now has a first arg, which is the item to drop.
Hand processing now uses drop_item properly, which fixes #3874, #3796.
Also fixes #3486.
2015-04-12 00:56:43 +01:00
ComicIronic
34bab36581 Changes to drop_item.
The drop_item arg is now the loc placed, not the child of the loc or whatever.
Removed a few lines of items being placed into themselves, on themselves, into other things manually, into their users, etc.
Cleans up the fix for MoMMI recharger silliness.

This took about 2 hours of non-stop manual searches.
2015-03-08 21:37:34 +00:00
JStheguy
dfc0cd5183 Updates things morer 2015-03-04 16:17:44 -06:00
JStheguy
892beb0078 Making Ashtrays Better(?)
-Allows cigarette butts to be put into ashtrays.
-Makes putting lit cigarettes into ashtrays put lit cigarettes into
ashtrays.
2015-03-03 19:55:58 -06:00
Rob Nelson
218414ff83 Add plastic to recycling, make a better way of sorting shit from the line.
AND CHANGE EVERYTHIIIIING
2014-02-07 07:33:48 -08:00
Rob Nelson
4e696f18c1 Make icon paths absolute. 2013-09-24 20:06:18 -07:00
Cael_Aislinn
1c9b04ec74 copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 21:07:16 +10:00
Spamcat
665c840da3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-26 23:57:05 +04:00
Spamcat
609c75fe58 Matches can be put in ashtrays as well. 2012-10-25 23:37:32 +04:00
Erthilo
aff3907c04 Cleaning up files and UltraLight, added some BS12 files, and fixes sprite issues. 2012-08-24 16:20:50 +01:00
comma
5ad05105f4 Small bugfix to ashtrays and cig butts
Now can throw out ashtray shards. 'ciguarete butt butt' should not appear anymore.
Also glass ashtray now shatters with sound
2012-03-04 06:45:14 +02:00
comma
ef6473b964 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Now working
And without promoting myself as Game Master :P

Signed-off-by: comma <krauchinsky@gmail.com>
2012-03-03 03:16:30 +02:00
comma
2edd73627d Added ashtrays
Breakable. Spill contents on breaking or hitting the solid stuff after being thrown.
Have limited capacity. Can be emptied in disposal outlet.
Change sprite when are half-filled and filled.
Also fiddled a bit with the cigs code, so you can put them out without dropping.
2012-03-02 21:56:08 +02:00