Commit Graph

156 Commits

Author SHA1 Message Date
Cheridan ea3d4b35c4 fixing conflict 2014-05-14 10:01:29 -05:00
Cheridan 3073d284ba Merge branch 'master' of https://github.com/tgstation/-tg-station into vitallyimportant 2014-05-14 09:52:47 -05:00
Jordie0608 4761e02904 Maybe i should make sure the code complies before pushing it next time 2014-05-13 02:32:56 +10:00
Jordie0608 4078973a5c Unidentinization 2014-05-13 02:18:21 +10:00
Jordie0608 dfd2cc4b60 Changed suicide messages to visible_messages and fixed relative pathing 2014-05-13 01:44:29 +10:00
Cheridan e2a2b15706 2-unit setting 2014-05-06 19:16:17 -05:00
Cheridan ab226de343 Makes nutrient bottles larger, reduces amount in vendor/generator to compensate. 2014-05-06 18:55:38 -05:00
Miauw62 eec72aa516 Merge pull request #3472 from Menshin/missing_nodrop
Nodrop  checks for several machines/structures
2014-05-03 15:44:26 +02:00
Rolan7 9c122c6919 Fragile thrown food items use del instead of qdel. This affects tomatoes, blue tomatoes, blood tomatoes, eggs, and pies. Pies and tomatoes now also apply reagents like the other thrown foods. Fixes issue #3561. 2014-04-28 02:40:58 -04:00
Menshin 80e7d1d0e7 Added a check for "_nodrop_" items for several machines/structures (fix #3407). 2014-04-20 20:49:32 +02:00
Razharas cae9fa555d Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull 2014-04-11 01:36:49 +04:00
Razharas cb5eaf0b10 Tweaks and giggles 2014-04-11 01:36:38 +04:00
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
Razharas 31d851d315 Such vines
So mutation
2014-04-10 07:51:20 +04:00
Razharas 42308da24d Merge pull request #3298 from Kelenius/hydrofix
Fixing banana peel
2014-04-07 18:39:53 -07:00
phil235 b095a3458c one missing period. derp 2014-04-05 18:02:40 +02:00
phil235 2a3924820f Add message when loading container.
* Add message when loading container.
* Change 'beaker' to 'container' (to include buckets)
2014-04-05 18:00:04 +02:00
Kelenius b7243b94c1 Fixing banana peel 2014-04-03 16:00:07 +04:00
Jordie0608 79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
Kelenius 1bf9a3ce17 Potency and chemicals fix 2014-03-28 10:20:33 +04:00
Kelenius 22908ee79a Conflict fix 2014-03-26 12:04:26 +04:00
Kelenius b91537055a Small fix 2014-03-26 10:35:25 +04: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
Kelenius 5c42a433d4 Minor fix 2014-03-11 15:49:53 +04:00
Kelenius 01aacde942 Tray's chemical procession is made into a separate proc.
Nutriments again affect plant's mutations and yeild.
Containers will no longer splash their contents at trays and biogenerators (fixes #2992).
Almost all spawn() removed from grown creation.
2014-03-09 11:37:13 +04: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
Razharas c548df264b Conflict fix 2014-03-05 06:30:29 +04:00
Cheridan 1cf3af0d72 Merge pull request #2973 from Kelenius/master
Seed extractor as storage
2014-03-04 17:04:22 -06:00
MrPerson 80a7a2abb4 Replaced a few more Del() and del() calls
Removed cigarette related reagent deleting. It's already done in atom/Destroy()!
2014-03-03 04:51:09 -08:00
Kelenius 4675af9f19 Seed extractor upgrade 2014-03-03 15:38:16 +04: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 3901aa51a0 Hydro fix 2014-03-03 05:33:37 +04:00
Razharas 2cbc3e45a3 Added trays 2014-03-02 07:19:41 +04:00
Razharas 2fd5557682 Conflict fix 2014-03-02 04:14:32 +04:00
Cheridan 98b39580cd haha oops thanks travis 2014-02-25 23:25:30 -06:00
Cheridan b84c7c3b1d Merge branch 'master' of https://github.com/Kelenius/-tg-station into Kelenius-master
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/game/machinery/vending.dm
	code/modules/hydroponics/hydroponics.dm
2014-02-25 23:11:56 -06:00
Cheridan 5ec24c8613 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/modules/reagents/Chemistry-Reagents.dm

resolved with Theirs, must manually reapply fixes
2014-02-25 19:39:26 -06: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 d8f12f0680 Merge pull request #2836 from Cheridan/hydro
Drying Rack as smartfridge
2014-02-24 07:56:17 -08: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
ChuckTheSheep eb27ebba95 fix 2014-02-20 14:05:23 -05:00
ChuckTheSheep 95bc337d62 A lot of Stuff From: #2849
https://github.com/tgstation/-tg-station/pull/2849
2014-02-20 13:28:07 -05:00
Kelenius afe48a1c48 Update2 2014-02-19 18:14:44 +04:00
Kelenius b5ad117c01 Less snowflake-y 2014-02-19 17:28:02 +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
Razharas 5a8eed4c32 Merge pull request #2824 from hornygranny/throw_range
throw_range pass
2014-02-18 16:17:13 -08:00
Cheridan 839ee11308 Merge branch 'master' of https://github.com/tgstation/-tg-station into hydro
Conflicts:
	code/game/machinery/drying_rack.dm
2014-02-18 15:25:16 -06:00
Cheridan 8f509fc4b2 drying rack as smartfridge
Converts the drying rack into a smart fridge, allowing for better usability (can now batch-dry), code cleanliness and reuse.
2014-02-18 15:16:40 -06:00