Commit Graph

83 Commits

Author SHA1 Message Date
VerySoft ed8c68e74a Item Bank - Do not store things crafted from material stacks
The item bank doesn't store what such things are made out of, and so, such things will not be correct when retrieved. 

This does not block things from being stored when made from the common crafting menu though, since those things spawn a defined item type instead of setting up material properties.
2022-02-19 20:23:42 -05:00
Aronai Sieyes 8c90e32ef3 Fix annoying runtime with exosuit fab 2021-08-26 19:51:00 -04:00
Aronai Sieyes e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
Heroman 9a690a41df Fixes in split instead of input 2021-08-11 07:17:21 +10:00
Heroman face394b62 Fixes infinite material duplication in R&D 2021-08-11 06:57:48 +10:00
MarinaGryphon 7820442652 Fix log examine being weird. 2021-07-09 08:35:11 -05:00
Aronai Sieyes 4c12504e3b Replace list inputs with tgui_input_list 2021-06-26 10:39:56 -04:00
Aronai Sieyes 85c31e9fda WIP fix of this PR 2021-06-21 19:29:43 -04:00
ShadowLarkens f1f0c3c7b2 Stack: Fix stack/use having a potential to sleep 2021-06-12 18:17:47 -07:00
Neerti 767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Novacat cc7f72a991 Merge branch 'master' into upstream-merge-7756 2021-03-09 15:11:54 -05:00
MistakeNot4892 3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Atermonera e052ff9517 Sheet Recipe Unexclusivity. 2021-01-14 01:11:20 -05:00
Mechoid 814375ea3b Matter Matters 2020-12-02 02:30:32 -05:00
Mechoid 019926cbc7 Fresh Meat, Leatherworking 2020-11-07 15:08:04 -05:00
ShadowLarkens 3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
ShadowLarkens 735230d642 TGUI Metal Menu (Travis stop it) 2020-09-11 21:21:50 -07:00
Aronai Sieyes 6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
Aronai Sieyes a03a3c0960 Change stack autocombine
Only happens when dropped or pulled by a mob, to avoid problems with stack-using machines and conveyors in mining
2020-05-18 22:35:13 -04:00
Arokha Sieyes 3911e14936 tg(?) style stack autocombining 2020-05-17 00:47:42 -04:00
Aronai Sieyes 0b19c528da Allows do_mob and do_after to be exclusive, to prevent stacking 2020-05-05 19:10:55 -04:00
Aronai Sieyes 6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Atermonera 11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Mechoid 169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Neerti 2f173dd16b Adds differing stack sprites
Ports most of /tg/'s sprites for stacks displaying their contents.  I added some of my own as well to fill in materials that we have but they didn't.
Moves all stack icons to their own dmi.
Reworks fifty_spawners to use paths instead of strings, as it prevents bugs in the long term.
2017-09-28 01:04:19 -04:00
Techhead0 deaac36479 Clicking a stack no longer transfers one sheet at a time. 2016-06-27 11:30:55 -05:00
Datraen beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Hubblenaut 5baf93722a Fixes subcategories of floor tiles not being placable 2015-12-10 16:28:40 +01:00
Hubblenaut 470d2bb54a Fixes stack creation logic and return value 2015-12-04 15:49:31 +01:00
Neerti 4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
PsiOmegaDelta 3fd172ee63 Merge pull request #11294 from Baystation12/master
Dev-freeze
2015-10-14 08:40:03 +02:00
Hubblenaut 1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02:00
PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
2015-10-11 17:17:41 +02:00
PsiOmegaDelta bd7c475fcc Stack material use now depends on charge costs.
This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943.
2015-10-08 20:29:39 +02:00
PsiOmegaDelta c376c08cc0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/girders.dm
	code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
mwerezak 13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
PsiOmegaDelta 1b10f78940 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-08-13 09:01:10 +02:00
HarpyEagle 19fbc71249 Removes req_amount from stack_recipe_list
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
2015-08-12 15:54:16 -04:00
PsiOmegaDelta c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml
2015-06-05 10:39:41 +02:00
PsiOmegaDelta 7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
PsiOmegaDelta 65fc980b20 Stack splitting and cable merging fixes.
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
2015-06-04 13:24:12 +02:00
GinjaNinja32 c77605265c code/game/objects, code/game/machinery merge fix 2015-06-02 20:18:45 +01:00
PsiOmega d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
Zuhayr c5df326533 Fixes #9414 2015-05-30 03:15:19 +09:30
Kelenius 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
Kelenius 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
Zuhayr 358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
PsiOmega e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00