Commit Graph

166 Commits

Author SHA1 Message Date
Razharas 2fd5557682 Conflict fix 2014-03-02 04:14:32 +04:00
Razharas 340846fb4d Quick fix 2014-02-25 05:05:12 +04:00
Kelenius af75d13216 Conflicts:
code/modules/hydroponics/hydroponics.dm
Fixed, hopefully
2014-02-25 01:26:05 +04:00
Razharas ba54bd940b Conflict fix 2014-02-24 22:12:02 +04:00
Razharas 3d90e8815e Merge pull request #2827 from Ergovisavi/muh_vision
Adding NVG's/Advanced Mesons to the protolathe, some human vision changes
2014-02-24 07:55:34 -08:00
Razharas 00512ba146 Merge pull request #2805 from rymd/somatoray
Floral somatoray requires radium instead of uranium
2014-02-24 07:54:39 -08:00
Razharas 0aaf809c70 Proper chem handling for protolathe and imprinter
Also imprinter is now according to basic code standarts
2014-02-24 19:19:03 +04:00
Razharas b27d9c7396 Added RPED, some sprites and new power cell path
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
2014-02-24 05:14:43 +04:00
Razharas 561efa4943 DNA and R&D console runtimes fix
Quiet simple
2014-02-21 17:37:14 +04:00
Kelenius 0cfa6ea316 Hydroponics tray is now a machine that can be upgraded with bigger matter bins for more water and nutriment capacity.
Tray icons will now only update when necessary.
Added cream, plant bag and mining satchel to biogenerator.
Biogenerator's messages are now shown on top of the menu, instead of a separate screen.
Examining the tray now tells you the name of the plant.
Hydroponics trays start without nutriment, more E-Z-Nutriment added to vendor to compensate
Seed vending machine's contents are now sorted.
2014-02-19 14:13:00 +04:00
Ergovisavi 62ab59b128 Changed the typepath of HUD sunglasses to be a child of the security hud
Removed all the istype checks for glasses in humans
Added advanced mesons (Old meson functionality of removing darkness overlay) and NVG's to the protolathe
2014-02-17 21:00:46 -08:00
rymd eaf247631b Enables addition of chemicals to protolathe.
Adds chemical storage interface to protolathe.
Fixes "purge" button for individual chemicals in the circuit imprinter doing nothing.
Adds radium reagent cost to floral somatoray.
2014-02-16 18:58:16 +00:00
rymd 27d1400ddb Removed uranium cost from floral somatoray 2014-02-15 19:19:17 +00:00
Alek2ander a59a058660 Who decided to have it like that? 2014-02-09 17:47:59 +04:00
Alek2ander 0dc569284d Research machines sorta cleanup
HREF exploits fixed for research machines and vending machines
2014-02-09 16:55:20 +04:00
Razharas 2a5e2ae021 SMES board fix
Blind copypaste is bad
2014-02-07 16:39:06 +04:00
Razharas df61e734ab Quick fix to designs and boards
Abloobloo
2014-02-07 12:25:29 +04:00
Razharas 2d125f0fc5 And more fixes
The ride never ends
2014-02-06 22:32:28 +04:00
Razharas a589387ccf Fixing merge conflicts
THis is getting harder and harder
2014-02-06 22:26:16 +04:00
Razharas c0aa3b56bb Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker
Conflicts:
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/aifixer.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/power/apc.dm
	code/modules/research/server.dm
	icons/obj/stationobjs.dmi

Yeah nah time to merge this shit behore resolving conflicts will take more than 2 hours
2014-02-06 22:05:39 +04:00
MrPerson 931da9e7ef Many changes
Much diff
2014-02-04 22:49:38 -08:00
Razharas a6ae0c06d4 Added constructable turbines
By Number's request
Also fixed some other minor stuff
2014-01-28 03:51:03 +04:00
Razharas 13d3cb21ce A bunch of fixes of using old type of proc
Now it all deconstructs properly
2014-01-26 11:56:14 +04:00
Razharas ea54257ab6 Ported cable coils to stacks crudely
Yeah
2014-01-22 02:11:19 +04:00
Razharas b8548d273a Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 2014-01-20 05:15:05 +04:00
Cheridan 70e5618cb0 Merge pull request #2375 from Giacom/remove_icon_operations_from_premises
[501] Refactored the code to remove most icon operations for changing an icon's colour.
2014-01-19 16:06:25 -08:00
Razharas dc498dc1ea Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 2014-01-18 23:31:51 +04:00
fleure 89bb6b8547 Merge pull request #2391 from ManeaterMildred/MechUpdate
Mech Update : Gygax, Ion and Carbine
2014-01-17 10:02:39 -08:00
Miauw 6704a9948d Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 2014-01-16 19:46:04 +01:00
ManeaterMildred e965ab5b63 Changed the name of the Carbine to give a hint of his incendiary abilities. 2014-01-16 16:37:43 +01:00
Giacomand aceb4b22e1 Removed the icon color blend operations from human's update_icons().
Changed all the hair/facial_hair/eye sprites to use a white base.
Changed the preview screen, in the preference menu, to use ICON_MULTIPLY to be able to use the new white sprites.
Removed the unused and broken cloaking item.
Ninjas now use the alpha variable, removed most of the checks for it.
Updated the documentation a bit.
Added some helper procs for later.
2014-01-16 14:33:50 +00:00
Razharas 03d1396aff Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 2014-01-15 03:56:04 +04:00
Razharas 93f8cac80a Semi-final update
Moved microwaves, biogenerators and R&D console to newer ui(not the nano
one)
One more deneric machine proc for unwrenching stuff
What didnt done: SMESes and hydro trays
Maybe all add them in the final update, maybe not, im not sure
2014-01-15 03:46:41 +04:00
Razharas 87f137766c Standartization and more issues fixing
More standart machinery procs
More sprites
Constructable mech rechargers
Over all tide up

Its not over yet folks, next are coming constructable kitchen machinery
and SMESes, update to newer uis, even more standartization and maybe
some more R&D content
Stay turned
2014-01-14 02:42:07 +04:00
ManeaterMildred c41e3b5d17 Added the Mech Ion Rifle, Mech Carbine, Mech Rocket Launcher
and Ion Rifle to the list of things you can build with the
Protolathe and Exosuit Fabricator.
2014-01-13 16:33:00 +01:00
Razharas 551a7ab0a3 Issues fixing
Added biogenerator and freezer/heater
Fixed issues gia pointed out
Added some lost sprites
2014-01-11 00:56:28 +04:00
Razharas 1685dd3b7a Machine overhaul 2: Constructable Revolution
Yeah i lost half of my work so its only other half
Durning this PR ill try to redo what was lost, in no way is it a
complete thing
Hope git wont do anything bad with it
2014-01-10 18:53:26 +04:00
Miauw 67e37bd449 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/research/designs.dm
	maps/tgstation.2.1.2.dmm
2014-01-07 18:18:59 +01:00
Razharas 83c9481bfc Fixes R&D working improperly
Yeah thats it
2014-01-06 21:34:10 +04:00
Razharas 06d1969fef Fixed some issues
No more suicider cloning
Added comments to the DNA and R&D wizardry
Added CLONE_INITIAL_DAMAGE define for the ammount of clone and brain
loss clones initially have in clonepod
Removed debug garbage
2014-01-02 09:27:51 +04:00
Razharas 579be8953f Tweak of destructive analyzer and span classes
Now instead of flat out refusing low reliability things it will be able
to take them inside and show the potential technology and reliability
level
It will also be able to deconstruct them, but if reliability is too low
it will show you that usual message but in the console window instead of
chat
Changed all the \red to span class in destructive analyzer's file
2013-12-30 03:56:45 +04:00
Razharas 908f28dab6 More machinery and type path fixes
Not parts are in null and not in machinery
2013-12-23 22:30:38 +04:00
Razharas d8a6cd530f Quick paths fix post haste
Coderbus make me do this
2013-12-23 22:00:43 +04:00
Razharas 4f8389ec0e Constructable machines will depend on R&D parts
DNA scanner:
Laser quality lessens the irradiation
Manipulator quality drastically improves the precision(9 times with best
part)
Scanner quality allows to scan suiciders/ling husks, best part enables
cloner's autoprocess button, making it scan people in the scanner
automatically
Clone pod:
Manipulator quality improves the speed of cloning
Scanning module quality affects with how much health people will be
ejected, will they get negative mutation/no mutations/clean of all
mutations/random good mutation, at best quality will enable clone
console's autoprocess button and will try to clone all the dead people
in records automatically, together with best DNA scanner parts cloning
console will be able to work in full automatic regime autoscanning
people and autocloning them
Borg recharger:
Capacitors' quality and powercell max charge affect the speed at which
borgs recharge
Manipulator quality allows borg to be slowly repaired while inside the
recharges, best manipulator allows even fire damage to be slowly
repaired
Portable power generators:
Capacitors' quality produce more power
Better lasers consume less fuel and reduce heat production
PACMAN with best parts can keep whole station powered with about sheet
of plamsa per minute(approximately, wasnt potent enough to test)
Protolathe:
Manipulators quality affects the cost of things(they will also have less
m_amt and g_amt to prevent production of infinity metal), best
manipulators reduces the cost 5 times (!)
Imprinter:
Manipulator quality affects the cost, best manipulator reduce cost(acid
insluded) 4 times, i.e. 20 boards per 100 units of acid
Destructive analyzer:
Better parts allow items with less reliability in
Redone how reliability is handled, you now see item reliability in the
deconstruction menu and deconstructing items that has same or one point
less research type level will rise the reliability of all known designs
that has one or more research type requarements as the deconstructed
item
Designs of the same type raise in reliability more
Removed reliability_base and reliability_mod completely because they
served no purpose
Critically broken things rise reliability of the design drastically
Whole reliability system is not used a lot but now at least on the R&D
part it finally matters
Didnt touch telecomms machinery, R&D code is messy but tcomms is just
another level, im not high enough to touch it yet
Most of things except for pacman are tested ingame, no bugs/runtimes
detected
2013-12-23 21:39:27 +04:00
Giacom 16cb706b79 Merge pull request #2062 from Aranclanos/RnDConsole
RnD console runtimes fix.
2013-12-21 13:38:32 -08:00
Miauw 7579110ea1 Honk RD design datums use string paths~ 2013-12-21 18:14:19 +01:00
Aranclanos 53a02296df Merge pull request #1989 from Perakp/dnaDecon
DNA scanner and cloning pod deconstruction
2013-12-17 20:44:16 -08:00
Aranclanos 627b5d046d Fixed some runtimes regarding the datum of the objecting being built being deleted while being constructed. 2013-12-17 13:31:23 -03:00
Aranclanos c04938cbc1 Merge pull request #1968 from Adrinus/12-03-13-Orion_Trail
Adds a new Arcade Machine.
2013-12-11 16:37:11 -08:00
Perakp b8a7957a22 Adds deconstruction for DNA scanner and cloning pod.
Adding wires to a machine frame uses one unit of wire.
Wires returned from deconstructing return 1 unit of wire.
Fixes issue #1001
2013-12-07 08:55:07 +02:00