Commit Graph

103 Commits

Author SHA1 Message Date
Bjorn Neergaard
4c192d705a Rewrite heaters/freezers; port to tgui
They are now one type, thermomachine.
2016-01-22 19:25:35 -06:00
AndrewJacksonThe2nd
1ab5e80458 Tesla map removal to fix merge 2015-12-19 12:32:50 -08:00
YotaXP
7de857b476 Upgrades the space heater! 2015-11-30 04:11:10 -05:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
Firecage
c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
bgobandit
899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
2015-11-18 19:55:06 -05:00
bgobandit
47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
GunHog
f0f16426b9 Gold requirement
- Circuit board design now requires gold.
- Origin and Required tech levels made consistent with a board that
takes gold.
2015-10-29 08:20:32 -05:00
GunHog
ea36718bc3 Buildable Rechargers!
- Rechargers can now be constructed/deconstructed as a machine. Requires
the board and a capacitor.
- Rechargers can now be upgraded with superior capacitors to increase
recharge rates!
2015-10-28 14:55:38 -05:00
Chiefwaffles
37625502bb Fixes ANOTHER conflict. 2015-07-17 18:37:52 -07:00
Chiefwaffles
2c3db425fa Resolve merge conflict, step 1. 2015-07-16 12:35:58 -07:00
phil235
3a93eeabba Merge branch 'master' of https://github.com/tgstation/-tg-station into DrinkingGlassPourFix
Conflicts:
	code/game/jobs/job/cargo_service.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/job.dm
2015-07-16 14:19:29 +02:00
duncathan
ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
2015-07-16 04:27:25 -06:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
8e92d3ced1 Fixes cable coil being dropped when trying to put it in a machine frame. 2015-07-15 16:08:10 +02:00
Chiefwaffles
d31d1a017a Adds emag/emp effects, makes AAS fully constructable, adds a circuitboard for the AAS, and adds overlays for announcements/errors. 2015-07-14 20:34:53 -07:00
duncathan
e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
Razharas
2ce9bdfb00 Fixes smartfridge construction and deconstruction
Fixes smartfridge construction and deconstruction
Added special proc for machinery to be called on deconstruction akin to
construction
2015-06-29 17:12:24 +03:00
Cheridan
9c97ee19de Merge pull request #9962 from phil235/MachineFrameDecoCrystalFix
Fixes machine frame not dropping all /obj/item upon deconstruction.
2015-06-19 13:44:04 -05:00
phil235
0bebf9d978 all /atom/movable in components are now properly ejected upon the machine frame's deconstruction. 2015-06-15 17:50:25 +02:00
phil235
68bd2e770a Deconstructing a machine frame will now properly drop all /obj/item (instead of only /obj/item/weapon),
it fixes bug where bluespace crystals are not being dropped.
2015-06-14 23:04:49 +02:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Iamgoofball
3c1a0dd0d5 SMARTFRIDGE, SEED EXTRACTOR, and MONKEY RECYCLER are now buildable. ORE REDEMPTION MACHINE can now be upgraded. 2015-06-06 12:47:11 -07:00
Iamgoofball
e1cfbdaed4 RECYCLER AND HOLOGRAPH PADS ARE BUILDABLE and bugfixes 2015-06-06 01:35:01 -07:00
Iamgoofball
467cc12ae5 fixes 2015-06-06 00:33:02 -07:00
Iamgoofball
b65c7a36df Upgrade Update: Bluespace Boogaloo 2015-06-05 23:56:09 -07:00
oranges
4ac3497ebe Change machine frames and girders deconstruction step
They now use the screwdriver instead of the welding tool

On top of that I added a check to ensure you can't disassemble the same girder
more than once to farm materials
2015-05-05 10:32:57 +12:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
kingofkosmos
ccdb41e6bf state check to disassembling the machine frame 2015-04-18 09:07:47 +03:00
kingofkosmos
d315681120 if(state == 1) added to few places. 2015-04-15 19:56:56 +03:00
kingofkosmos
6ba41ca7a7 Do_afters now use "target = src", removed oldloc-stuff.
False wall construction had a bug if you had exactly 2 sheets in your hand, it wouldn't work - fixed it.
2015-04-14 19:45:08 +03:00
kingofkosmos
9009ff3bcc Added machine frame disassembly with welder and securing/unsecuring with wrench. 2015-04-09 19:37:26 +03:00
kingofkosmos
a3129ec027 dsfagregg 2015-04-08 20:36:01 +03:00
Pennwick
bded834d9e Update constructable_frame.dm
Added Chem master build path.
2015-03-21 18:30:36 -05:00
Delimusca
f707a7824d fixes heater construction 2015-02-26 00:35:45 -07:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
tkdrg
4a6df00494 Adds chemical heater nanoUI & construction/upgrade
Also buffs the heater to heat/cool 10 kelvin per tick per upgrade level.

Fixes #7040
Fixes #7060
2015-01-14 22:41:53 -03:00
Sawu
feb141ca15 Merge branch 'master' of https://github.com/tgstation/-tg-station into freshfood
Conflicts:
	code/modules/research/designs/machine_designs.dm
2015-01-08 03:58:31 +11:00
Sawu
9a20d1cb09 Adds the new "E.X.P.E.R.I-MENTOR" research machine, an alternate research option.
*Built with 1 scanning module, 2 manipulators and 2 micro lasers.
*Manipulators affect the reset speed, lasers affect it's chance to have bad things happen.
*Heavily RNG based to be the "fun" alternative.
*Includes features such as causing spacial distortions, transforming things into other things, and setting your face on fire.
*Can be built, but currently not included on the map.

The process of the EXPERI-MENTOR works as such:
1. Build it/walk up to it and click the "Scan for R&D Console" button if it is there.
2. Insert anything, literally anything.
3. The user uses a process of elimination to guess what the correct use for the item is ("Poke", "Irradiate", "Gas", "Heat", "Cold" or "Obliterate")
4. A correct guess results in addition of research points and (potentially) a randomised thing happening (reduced with upgrades). A failed results in a fluff message.

Current "use" RND events are:
Poke
*Destroy item, hit mobs in oview(1) for 15 brute
*Destroy item, proceeding to Obliterate
*Eject the item, throwing it at a random target in oview(7)
Irradiate
*Destroy item, apply 25 IRRADIATE to oview(1)
*In oview(1), spawn goo in oview(1)
*Transform item into something from valid_items list and eject it (primes grenades first)
Gas
*Destroy item, spawn toxic gas cloud
*Spawn harmless gas cloud
*Destroy item, Empulse(8,10)
Heat
*Destroy item, explosion(-1,0,0,0,0,flame_range = 2) (sets a small fire)
*Destroy item, heat up turf
*Eject item, spawn smoke, hit mobs for 5 burn in oview(1)
Cold
*Destroy item, release frostoil smoke
*Destroy item, cool down turf
*Eject item, spawn smoke
Obliterate
(by default, this will transfer m_amount and g_amount to a linked lathe)
(I'm aware that both of these are kind of "one item at a time", but I like the effect and left it that way)
*Destroy item, pull all mobs and items in oview(7) towards src
*Destroy item, throw all mob and items in oview(7) at other mobs and items
2015-01-05 04:53:51 +11:00
Menshin
42b701b57e * Fixed runtimes at init with the previous construction method for freezers, heaters and cryo cells
* Made engineers less clumsy when rotating machinery (turn at 90° instead of a random direction)
2014-12-23 18:00:39 +01:00
paprka
fe94f9cab0 Fixes a bunch of capitalization inconsistencies, adds names to vendors 2014-11-12 15:37:21 -08:00
GunHog
dd7bfbff59 Adds a sound for the RPED!
When used to exchange or install parts, the RPED will play a cool
machiney sound! Sound by Cuboos.
2014-11-08 23:49:04 -06:00
GunHog
e859375d3e RPED Installation Complete Fix + Circuit changes
- The RPED now sorts its parts when installing new equipment - It will
always use the best parts contained within.
- Made all the req_component lists of circuitboards actual paths instead
of pure text. Hopefully I fixed everything that broke when I did that.
2014-11-08 19:11:04 -06:00
GunHog
74a84ff735 Partial Fix
Partially fixes the bug of the RPED not using better parts when
installing parts to an incomplete machine.

It is still possible for it to not use top tier parts, however, if More
than two tiers of the same part exist.
2014-11-05 13:21:36 -06:00
GunHog
e5b868fb27 RPED Expansion
Ports https://github.com/NTStation/NTstation13/pull/982 from NT.

Summary of changes:
- The Rapid Part Exchange Device (RPED) can now install stored parts
into unfinished machines! Once you have installed a circuit board to the
frame, use the RPED to add any required parts contained inside, then
finish with a screwdriver!
- Identical parts in the RPED are now shown in groups, just like a
mining satchel.
- RPED storage capacity increased. It can now contain up to 50 parts,
fewer if power cells are added as well.  Maximum weight class of 100
(parts except power cells are class 2).
<b>The storage values are up for discussion. I chose the original values
based on the mining satchel.<\b>

Unrelated:
- The admin-only debug research item now includes plasma and engineering
tech.
2014-10-31 10:30:43 -05:00
unknown
0ebb633a16 Mining Machines: Implementing ex_act()
Implemented ex_act() in both the ore redemption machine and the mining
vendor. Sparks were added as a feedback for any explosion that call
ex_act() on these machines.
To allow for the reconstruction of these devices, I have implemented
machine recepies and circuitboard definitions for these devices. I also added
R&D recipies for the circuitboards.
Offline and Open icons have been added for both objects.

Squashed all of my previous commits and fixed the leftover garbled code
from my original rebase.
2014-07-20 01:11:06 -04:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
phil235
c009cac6d2 Cooler -> Freezer 2014-05-02 17:29:05 +02:00
MrPerson
6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
2014-03-08 22:03:03 -08:00