Commit Graph

28 Commits

Author SHA1 Message Date
FalseIncarnate
28347540b6 Merge Conflict Fix
Because Ponies removed commented out code.
2015-05-27 00:57:57 -04:00
FalseIncarnate
c385cb7f4f Botany Belt, Biogenerator Additions
Adds in the new Botany Belt, a belt designed for handling all sorts of
botany-related tools.

Adds the Botany Belt, Security Belt, Medical Belt, Janitor Belt, and
Bandolier to the Biogenerator's list of products.

Re-arranges the biogenerator's product listing to have a new "Belts"
section, dedicated to (you guessed it) belts.
- Moves the Utility (tool) into the Belts section, previously was in the
Leather section
- The new belt listings are also in this section.

All belts in the biogenerator have the same base cost of 300 points.
Increasing the efficiency of the machine will lower the costs
appropriately.

Adjusts some code related to the security belt so they won't magically
have a seclite in them when created via biogenerator.
- The belts in the sec lockers will still have their light
- The ERT belt no longer needs to clear contents during its New() proc
to remove the seclite.
2015-05-26 13:54:24 -04:00
FalseIncarnate
b20d004142 Biogenerator Biomass Value Fix
Fixes the Biogenerator only giving one point of biomass per product
inserted.

The biogenerator previously calculated the points based on the amount of
the nutriment reagent in the products inserted.

Now the biogenerator will calculate the points based on the combined
amounts of the nutriment and plant-matter reagents in the product.

Overall, this just restores the values back to their pre-Nutrient
Changes levels, as nutriment in plant products was replaced with
plant-matter for nearly every plant that had it.
2015-05-25 15:20:58 -04:00
Krausus
6aec924f73 Fixes biogenerator issues
Fixes the biogenerator getting stuck if it can't fill a beaker, eating
resources if it can't fill a beaker, and getting splashed every time you
tried to load a beaker.
2015-05-18 08:54:26 -04:00
MrBauer24
499e0797be Biogenerator fix
Fixes bug #1076 and displays a warning message telling the user that the
beaker is full.
2015-05-16 13:54:26 +01:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
DZD
fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Markolie
c2058c4a9d Update our /Topic code to prevent exploits 2015-02-09 18:22:22 +01:00
Markolie
f03bbf8bc6 Bug fixes 2014-12-24 12:53:49 +01:00
Markolie
876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Zuhayr
23ef5530de Changed hydro trays, fertilizer and syringes over to use the reagent procs.
Conflicts:
	code/game/machinery/biogenerator.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	maps/tgstation2.dmm
2014-08-02 22:33:47 -04:00
dylanstrategie
d78d9eabc2 Added a few more machines
Conflicts:
	code/game/machinery/Sleeper.dm
	code/game/machinery/adv_med.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/cloning.dm
2014-07-20 11:11:40 -04:00
Jeremy Liberman
c74ff2d653 Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
2014-04-03 21:42:33 +02:00
ZomgPonies
031f67110b Fixes some sounds 2014-01-16 05:23:32 -05:00
petethegoat@gmail.com
11b17c4442 Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746
Standardization of the object tree and some modified functionality.
Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type.
Replacement Light boxes pick up lights (for example broken ones) when used on them
Moved weapon/secstorage to storage/secure
Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm
Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles.
Dice packs are now pill bottles, and all pill bottles can pick up dice.
Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time.
Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code.
Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code.

Updated all maps.

I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any.

Full (i think) list of changed paths:
/obj/item/weapon/storage/flashbang_kit	> /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box	> /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit	> /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit	> /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit	> /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit	> /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket		> /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps	> /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox		> /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit		> /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed	> /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit	> /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox	> /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes	> /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit		> /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox	> /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit	> /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit	> /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs	> /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag		> /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel	> /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag		> /obj/item/weapon/storage/bag/trash

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 19:11:56 +00:00
giacomand@gmail.com
b00c0c2a9f -New sprites APC sprites by TankNut!
-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 14:45:29 +00:00
giacomand@gmail.com
6a2d78bc94 -Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
-Atmos delay is now based on active players, to help fight lag for massive player rounds.

-Changed some for(blah in world) loops to use the correct lists.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
elly1989@rocketmail.com
4073ac9b00 Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.
All credits to the author for this handy little script.
I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work.

To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders"

If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-18 16:33:40 +00:00
petethegoat@gmail.com
0970e6c55d Standardised reagent colour mixing a little bit. Fixes issue 785.
Changed the path of large beakers, so they're actually a subtype of beaker (wtf)

Moved new_year.dm to unused.
Updated Carn's sequential master controller to not have tension stuff, for potential live testing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4444 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-16 18:33:34 +00:00
sieve32@gmail.com
459c558898 -Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.

r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds

[VGTG]

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-23 00:48:51 +00:00
ericgfwong@hotmail.com
25bf3ac5ca -Biogenerators can now produce leather satchels for 400 points
-Leather products made a bit cheaper to produce
-Floor tiles made easier to produce by increasing the buildable stack size
-Fixed kitchen shutter button using the wrong req_access

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4125 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-20 04:08:12 +00:00
d_h2005@yahoo.com
e01cec85ef -Biogenerators can now make leather wallets.
-Glasses of Coffee, Ice, Iced Coffee, and Bilk now work properly, instead of making glasses of ..what?
-New stun baton sprites.
-Sprites for windoor construction.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3714 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-01 20:53:32 +00:00
d_h2005@yahoo.com
a5eaa18d21 -The biogenerator is now more robust. It can dispense fertilizer in batches, and make simple leather items at a high cost.
-Watermelon and pumpkin biomass lowered a bit so biomass isn't totally trivial to acquire.
-Added more wood items for tower cap wood construction: Wooden doors and sandals.
-Added plump helmet biscuits and mushroom soup to kitchen recipes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3454 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-14 06:42:46 +00:00
quartz235@gmail.com
d22c7cd6d5 Fixin runtimes and wooing the hot womenfolk
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3340 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-23 00:45:53 +00:00
LastBattaWolf@hotmail.com
0d5948fdea The wizard now has a voice, and plantbags can now feed plants directly into the biogenerator.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2059 316c924e-a436-60f5-8080-3fe189b3f50e
2011-08-29 00:41:37 +00:00
musketstgstation@gmail.com
3b0400acaa Full Potential (Botany-Chemistry-Kitchen) step one:
(Contributed by EuroNumbers)

Changelog:

- Plant potency now works. Amount of reagents inside of a fruit is based on the plant's potency.
- Minor adjustments to plants.
- Biogenerator fix. Amount of points is determined by the amount of nutrients plant has
- Blender fix. Amount of nutrients from tomatoes, soybeans and corn is transformed into their respected reagents properly in accordance to conservation of mass
- Plantspray and weedspray functionality reintroduced.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2034 316c924e-a436-60f5-8080-3fe189b3f50e
2011-08-21 23:49:17 +00:00
vageyenaman@gmail.com
80d4e405b9 New DNA mutation system: see http://tgstation13.pretentiousfool.com/phpBB3/viewtopic.php?f=7&t=5584 (the code that makes this actually work has been commented out, it will be implemented maybe sometime soon)
Fixed some spelling and grammar errors.

Tweaked the cost of Large Energy Crossbow designs.

Fixed a bug where people would generate two manifest entries when they late-joined. Annoying as fuck.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1966 316c924e-a436-60f5-8080-3fe189b3f50e
2011-08-02 01:35:44 +00:00
rastaf.zero@gmail.com
338c826d1c - invented new machine for botanists: Biogenerator. Biogenerator converts unneeded biomass to useful substances like milk. Avaylable only trough admin powers at the moment.
- added roller bed (for medics). Place human, buckle him to this bed, the bed raises and can be pulled.

- eggs and tomatoes can be smashed of wall, floor [s]or captain's face[/s] not yes.

Code by Balagi, sprites by Farart.

-some fixes for the crew monitoring computer. It can be disassembled now.
-added crew monitoring circuit board. Requires programming  3, biotech 2, magnets 2.
-Mech Bay Power Control Console и Solar Control can be disassembled now.
-added crew Mech Bay Power Control Console circuit. Requirements are programming=2, powerstorage=3.
-Solar Control circuit boardcan be researched. Requirements are programming=2, powerstorage=2.
-R&D Console can be researched and created (requires programming 6). But R&D Console cannot be deconstructed for tech points. That's intended.
Code by Jack Rost.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1880 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-18 03:48:37 +00:00