d1efe83113
Merge branch 'master' into upstream-merge-11508
2021-08-26 21:00:44 -04:00
4cd79beb29
Fix annoying runtime with exosuit fab
2021-08-27 00:11:54 +00:00
af0d7a0f6b
Make stack amount var private
2021-08-26 15:39:04 +00:00
b291d87e18
Merge pull request #11387 from Heroman3003/dupefix
...
Fixes infinite material duplication in R&D
2021-08-11 02:51:43 +00:00
205ef740bd
Merge pull request #10993 from MarinaGryphon/issue/logpile
...
Stack Examine Improvements, Log Examine Fix
2021-07-09 16:19:16 +00:00
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
fb343cec6c
[MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-22 22:17:02 +00:00
a94e471add
Material Container Component & Autolathe QoL
2021-06-13 03:18:30 +00:00
20e3b0a2d3
[MIRROR] Linter Introduction + Cleanup
2021-05-27 16:31:50 +00:00
9270659dbb
[MIRROR] Matter Matters
2021-03-09 20:42:39 +00:00
ad57e1ad13
[MIRROR] Sideports a couple of init unit tests from Neb.
2021-02-27 18:45:36 +00:00
32f728a713
Merge pull request #9572 from VOREStation/upstream-merge-7824
...
[MIRROR] Sheet Recipe Unexclusivity.
2021-01-14 18:05:02 +00:00
018d176c51
[MIRROR] Fresh Meat, Leatherworking
2020-11-08 17:04:32 +00:00
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
735230d642
TGUI Metal Menu (Travis stop it)
2020-09-11 21:21:50 -07:00
6809133d75
Port Eris' extensive floor blending system
2020-05-29 14:00:43 -04:00
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
3911e14936
tg(?) style stack autocombining
2020-05-17 00:47:42 -04:00
0b19c528da
Allows do_mob and do_after to be exclusive, to prevent stacking
2020-05-05 19:10:55 -04:00
6ebd249748
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
11eed81b92
Ports precision placement of items
2020-02-22 02:35:41 -05:00
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
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
deaac36479
Clicking a stack no longer transfers one sheet at a time.
2016-06-27 11:30:55 -05:00
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
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
5baf93722a
Fixes subcategories of floor tiles not being placable
2015-12-10 16:28:40 +01:00
470d2bb54a
Fixes stack creation logic and return value
2015-12-04 15:49:31 +01:00
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
3fd172ee63
Merge pull request #11294 from Baystation12/master
...
Dev-freeze
2015-10-14 08:40:03 +02:00
1c8ec1a700
Fixes stack creation logic and return value
2015-10-11 22:02:05 +02:00
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
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
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
13c760c5bb
Fixes #9453 and fixes #10614
2015-08-22 11:09:17 -04:00
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
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
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
7f9996eece
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-05 10:23:23 +02:00
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
c77605265c
code/game/objects, code/game/machinery merge fix
2015-06-02 20:18:45 +01:00
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
c5df326533
Fixes #9414
2015-05-30 03:15:19 +09:30
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
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02:00
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
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
Nadyr