Commit Graph

180 Commits

Author SHA1 Message Date
Jordie0608 b18cc7d54e Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
Firecage aad822768f Sensible circuit design names
Signed-off-by: Firecage <firecage@hotmail.com>
2014-04-08 14:09:40 +02:00
Firecage 73e8731f5b Standardizing circuitboard design names 2014-04-07 23:01:56 +02:00
Razharas f7e3737f3f Span classes yaaaaay 2014-04-03 15:37:53 +04:00
Razharas e86ab01626 Fixes R&D machinery materials adding exploit
Fixes https://github.com/tgstation/-tg-station/issues/3259
2014-04-01 21:21:08 +04:00
Jordie0608 79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
phil235 e682348d53 Adding four boards to the list of R&D circuit designs
Adds the boards for telecom traffic control console, telescience console, mechbay recharger and vendor to the list of R&D designs.
Fixes some minor typos.
2014-03-29 18:13:04 +01:00
Mloc-Hibernia 8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
MrPerson 6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
2014-03-21 03:05:39 -07:00
Emil 05203ba8a1 Added an 'e' to 'Rest'. R&D computer 2014-03-17 17:59:07 +01:00
MrPerson 75353c1681 Stat number of dels per tick
More del(AM) -> qdel(AM)
2014-03-08 23:26:33 -08: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
MrPerson 3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
2014-03-02 21:39:27 -08:00
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
MrPerson 9eee3e5067 First pass at a qdel() garbage collection system for tgstation
Works pretty well. If it can't GC something, it'll just del() it and be done.
Speed is amazing, holy shit.

New procs you should be aware of:
qdel(atom/movable) - sets up an object for garbage collection. Call this rather than del(atom/movable).
atom/movable/Destroy() - called right before the object is GC'd, so it still has a loc. Also called if the object is del()'d.
new controller - garbage.dm has all the details on this. Basically it nulls all references on GC'd objects and force del() them if necessary.
Generally speaking, objects should use Destroy() for behavior prior to deletion rather than Del(). You should also always call the parent so the object gets the right gc_destroyed var set.

ISSUES:
Tries to GC mobs atm. This actually works for new players, not so much for humans/monkies/simple_animals/anything. I'm guessing it needs to clear out their mind and HUD and maybe other things.
Gibbing is really bugged. It works, but the overlays just sit there for awhile and ugh. I'm very tempted just to del() mob/living and mob/camera and call it a day.
qdel() equipment doesn't unequip the item.
Pipes don't generally GC correctly. Debugging suggests they get referenced in many pipenets and that isn't cleared properly. However some do work fine. Need assistance here.
Bots don't GC, probably in the radio controller.
Lots of other shit doesn't GC but it's hard to find them because of the pipe spam.
I think I'm calling Destroy() twice by accident.
2014-02-23 14:55:12 -08: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