Commit Graph

90 Commits

Author SHA1 Message Date
Fox-McCloud
a1341f02af Sleeper Changes 2016-07-16 01:31:34 -04:00
FalseIncarnate
adbc85a56b Buildable Deep Fryers
Deep fryers can now be built and upgraded with some minor assistance
from science.
- Board requires programming 2, just like the microwave and such
- 2 micro lasers + 5 cables
- Upgrading the lasers decreases the cook time

🆑
rscadd: Deepfryers are no longer arcane mysteries, and can be
(de)constructed and upgraded.
/🆑
2016-07-07 18:47:56 -04:00
monster860
a7330745a2 Adds permanent teleporter 2016-05-14 18:09:47 -04:00
Fox McCloud
283acc01d3 Merge pull request #4258 from pinatacolada/fridges
Makes fridge boards be selectable
2016-04-26 18:54:17 -04:00
pinatacolada
35b2d8589c what falseincarnate said 2016-04-21 21:48:28 +01:00
pinatacolada
b35b3cf870 Makes fridge boards be selectable
Screwdrive the board to select what type of fridge board you want.

🆑 pinatacolada
tweak: Makes fridge boards be selectable by screwdriving them
/🆑
2016-04-21 18:02:54 +01:00
Matt
8f4fd998a9 Fixes and prizes 2016-04-19 22:05:43 +02:00
FalseIncarnate
397d71a3af Vendor Changes
Re-upload without the smoking pipe stuff.
2016-04-10 00:07:37 -04:00
FalseIncarnate
990c83c6bb Revert "Vendor and Pipe Changes"
This reverts commit d21168fb38.
2016-04-09 23:38:36 -04:00
FalseIncarnate
d21168fb38 Vendor and Pipe Changes
Using a screwdriver on a vendor circuitboard now provides a nice list of machines to select from, rather than relying
on RNG to select them.

Vendor circuitboards have been moved from the Circuit imprinter to the Autolathe, and have had their costs tweaked accordingly
- Was 1000 glass and 20 sacid, now 750 glass and 250 metal
- This was because cargo is meant to be responsible for vending machines, and you had to get the supply containers from cargo ANYWAYS just to build a new one

Pipes, cigarettes, and joints can no longer be lit with a burnt match

Pipes and corncob pipes no longer can be refilled infinitely at whim
- A new item "pipe tobacco tin" has been added to the cigarette vendors, which can be used on an empty pipe to refill it 5 times before being consumed.
- Tobacco, Space Tobacco, Ambrosia Vulgaris, and Ambrosia Deus can be put directly into an empty pipe to fill it with that as an alternative

Pipes (the ones from the merch store computer) have had their volume reduced to 100, from 200 (that's still a lot of nicotine)

Corncob Pipes no longer come pre-filled, as that made no sense (normal pipes still come pre-filled, because you paid good money for that)
- They have also had their smoketime reduced to 400, from 800, so they don't last longer than purchased pipes
2016-04-08 02:51:04 -04:00
Tigercat2000
797740da7d Fix all of the merge conflicts and lacking to_chats with 4041 2016-04-05 21:16:52 -07:00
Tigercat2000
dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/game/machinery/door_control.dm
2016-04-05 21:10:36 -07:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
FalseIncarnate
b91740b19b Logic Gates
Adds CONVERT Gates, for converting a signaler signal to logic or
vice-versa.

Restructured/renamed some of the new logic files
- Split up the logic_gates.dm file into three files
- mono_input.dm
- dual_input.dm
- converter.dm

Made the logic_gate machines auto-update their multitool menu when you
click the links

Made the logic gate circuit boards a product of the autolathe
- Take that science. Quit hogging all the boards, nerds.

Removed relative pathing from signaler.dm
2016-03-30 02:21:10 -04:00
FalseIncarnate
112523086b Logic Gates WIP Commit 2016-03-28 00:53:21 -04:00
FalseIncarnate
474dbb6b82 Buildable Xenobotany Machines
A long-requested feature, you can now build the two xenobotany machines
- Lysis-Isolation Centrifuge
- Requires 1 matter bin, 1 scanning module, and 1 console screen
- Upgrading the scanning module causes less degradation when extracting
genes, meaning seeds last longer
- Bioballistic Delivery System
- Requires 1 matter bin, 1 manipulator, and 1 console screen
- Upgrading the manipulator decreases the degradation caused by splicing
genes, meaning you can (theoretically) splice more onto a pack before it
fails
2016-03-10 21:46:07 -05:00
Crazylemon64
8a7a17b8e6 Adds matrix and path editing to the variable viewer 2016-02-19 01:20:01 -08:00
FalseIncarnate
0015eac2c8 Arcade Prize Counter 2016-02-14 01:58:36 -05:00
Fox-McCloud
51851e9ec5 Constructible Chem Master 2016-01-04 18:23:41 -05:00
Fox-McCloud
5069d949bd Ports TG's Tesla Engine 2015-12-24 00:40:20 -05:00
Fox-McCloud
c83a36aa21 Ports Rapid Construction for Part Replacer 2015-12-16 23:42:39 -05:00
Fox-McCloud
068bfd10ba TG Mining Update 2015-12-10 21:35:02 -05:00
FalseIncarnate
6dfbd8f260 Claw Games!
Adds claw games, the absolute most-infuriating arcade game known to
mankind.
- Uses new fancy HTML5 / Javascript code stuff
- Is buildable!
- Science can produce the board with programming 2
- Requires a matter bin, manipulator, some cables, and a sheet of glass
- Costs money!
- Accepts cash or ID swipes, 15 credits per play token
- Dispenses prizeballs!
- Open them for a random plushie, carp plushie, or action figure!
- Two sets of sprites, thanks to FoS and Stephanov

Notes for the coders / future:
This provides a basic example for introducing new HTML5 / Javascript
arcade games, as well as a base type machine to use for such games.
While this may seem silly, this proves that we are not doom to have to
tolerate only the battle game and Orion Trail forever, and can even make
our own games for the arcade.
2015-12-09 00:37:30 -05:00
Crazylemon
13b97712a2 Stacks can now be added to machines again just fine
Also took out the unnecessary "You can't add this to the machine!"
message when using a screwdriver on frames
2015-09-29 14:15:47 -07:00
Crazylemon
a1636b3b24 NODROP is now more respected
A few machines, especially in medical, didn't respect NODROP. Hopefully
with these changes, medical cyborgs should no longer get their beaker
stuck in some sort of bizarre multipositional limbo.
2015-09-28 14:48:06 -07:00
Fox-McCloud
d5a6959c27 Gas Turbine 2015-09-25 05:23:05 -04:00
Markolie
c5c64413a1 Pipenet overhaul 2015-09-21 02:11:54 +02:00
Fox-McCloud
d41b09c0a6 Experimentor Addition--Telesci Removal 2015-09-17 00:59:38 -04:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Tigercat2000
7f4ac72910 Progress bars + Wall Rationalization
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
DZD
32c849a1d5 More buildables, some fixes, upgradable smartfridge
- Fuel is now available in the tier 4 reagent list for buildable chem
dispensers.
- Seed extractor, gibber, and recycler can be built, but having better
stock parts has no effect.
- Smartfridge can hold up to 1500 items by default instead of 999,
upgrading matter bin allows it to hold more.
2015-08-21 20:06:23 -04:00
DZD
5ce49bb3b3 Machine Upgrade Update
- Partial port of tgstation/-tg-station#9813
2015-08-20 21:03:19 -04:00
DZD
51eca017ad Fixes based on feedback 2015-07-29 18:39:54 -04:00
DZD
ab29813d4c Removes MRSPACMAN Generator
This used one of the Bay metals as a power source, I removed the actual
machine but forgot to remove the design and board. Whoops. Also, fuck
people setting object paths as strings instead of actual paths.
2015-07-29 17:32:06 -04:00
DZD
29e70854e9 Fix merge conflicts
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
FalseIncarnate
8a8011acbf Kitchen Machine Refactor and Max Item fix
Refactors the code for Microwaves, Ovens, Grills, and Candy Makers to
utilize a shared parent which holds the common procs.
- This means any new additions or fixes will only need to be implemented
in one place, rather than 4, to affect them all.
- Also reduces file sizes on the individual machines' files by removing
a lot of the duplicate code

Updated the code for the kitchen machines to be more modular and fixed
some issues.
- Replaced color macros with span classes
- Replaced hardcoded names with src references
- Each machine has a cook_verbs list which is used to create the in use
message (Microwaving in progress)
- Each machine has variables to define the icon states for the different
states of the machine (on, off, broken, dirty, open).
- Changed a few formerly global variables to not be global, as this
would cause issues with the shared code (microwave with candy maker
recipes for example)

Fixed a bug where the microwave would be considered "full" before having
all of the ingredients for a recipe
- Created a new proc to count the number of items and fruits in a recipe
to determine the max_n_items value

Map Edits to Cyberiad and associated Z-levels for pathing changes
(map-merged)
- MetaStation will need to be updated as well, I'll do this in another
PR unless someone else beats me to it.
2015-07-10 09:46:30 -04:00
DZD
916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
FalseIncarnate
9074629123 Aquariums and Pet Rocks!
Adds fishbowls, fish tanks, and wall aquariums.
- Buildable with glass
- Fish Tanks and Wall Aquariums also have built-in lights that can be
toggled
- Wall Aquariums block atmos just like a full window or wall.

Adds fish and fish/aquarium related items:
- Goldfish, Clownfish, Sharks, and Baby Space Carp
- Eggs can be obtained for each of these fish types and a dud egg type.
- Fish food, fish nets, egg scoops, tank brushes
- These are used to maintain your aquarium

Adds new vendor: CritterCare!
- Sells pet supplies and pet rocks!
- Moved pet collars from the clothing machine into the CritterCare

Adds new room/area: Pet Store!
- Located between the Port Emergency Storage and Auxilary Tool Storage
(across from the Vault)
- Contains a CritterCare machine, 2 fishbowls, a bucket, and a sink

Adjusts some Cargo order options!
- New category: Vending
- Contains all the vending machine refill crates
- Renamed the Bartending Supply Crate to Bar Supply Crate to avoid
confusion
- Removes the coffee refill canisters from the Bar Supply Crate, placed
them into the new Coffee Supply Crate
- Adds new Clothing Supply Crate, contains refill canisters for the
Hatlord 9000, Suitlord 9000, Shoelord 9000, and ClothesMate vendors
- Adds new Pet Supply Crate, contains refill canisters for the new
CritterCare vendor

Makes the ClothesMate and CritterCare vendors constructable
- Using a screwdriver on a vendor circuitboard will now have a chance to
set it to the ClothesMate or CritterCare setting, in addition to the
previously possible settings like Booze-o-mat and Shoelord 9000.
New reagent: Fishwater
- Obtained by using an empty reagent_container on any aquarium that has
some water in it.
- Ingesting fishwater has a 30% chance per cycle to make you vomit (what
did you expect from dirty water and fish poo?)
- Fishwater is good for botany, as it provides both water and nutrients
to hydro trays

ADDITIONAL FIXES!
- Fixes the abandoned bar's misaligned area (mostly a mapper thing, will
also ensure an APC in the area will properly power the entire area (and
not space)
- Fixes a couple instances of piping mistakes where there were manifolds
and straight pipes on the same tile, preventing vent-crawlers from being
able to navigate properly
- One was in security, another was the back room of hydroponics
- Fixed a missing pipe in the AI upload causing the vent to be
disconnected from the pipe network
2015-06-12 04:14:28 -04:00
Krausus
f84e7e8e8d Fixes losing items when dismantling machine frames 2015-05-30 06:25:46 -04:00
Fox-McCloud
4bd18261e6 [Goonchem] Reagent Temperatures 2015-04-08 02:44:50 -04:00
Tigercat2000
ca4b092445 Whoops, left in an old reference, didn't update parts, fixes #463 2015-03-24 12:56:59 +01:00
Tigercat2000
76ffbbfd59 Massive spacepod construction overhaul by /VG/ 2015-03-23 02:36:49 +01:00
FalseIncarnate
ae13c938c5 Kitchen Overhaul
MASSIVE overhaul to the kitchen, should make the chef job more
interesting.

Additions:
- Candy Maker!
- - This machine allows the chef to create a variety of sugary treats
for the crew to enjoy.
- Candy! Lots of candy and this is only the first wave!
- - More candy planned / dreamed for the future
- Candy Moulds
- - Craftable from plastic sheets, also available in the kitchen vendor.
Use these to make different candy types
- - These are returned if you successfully make the candy. Screw up and
the mould is destroyed!
- Cardboard Tubes are now craftable from cardboard

Changes:
- Oven and Grill have been updated to work more in line with the
Microwave and Candy Maker.
- - This means that they are also buildable and upgradeable!
- - Boards for the oven, grill, and candy maker are available from the
circuit printer.
- Many recipes moved from the microwave to the oven and grill.
- - For example, bread is made in the oven, and kabobs are made on the
grill.
- Adds "byproduct" var to recipes
- - Allows for the return of an item in addition to the result,
currently used for candy moulds

Fixes
- Adds Grape Juice reagent.
- - This will fix a runtime and also allow people to actually drink from
the purple cans.

Sprite Credits
- Many thanks to FoS for their sprites for a lot of the candies which I
combined and recolored
- - Also thanks for the new sprites which were included, but not all
used (yet!)
- I also edited and created some horrible sprites for a few candy items
and machine states.
- - Hopefully they will be such an eyesore that a real spriter steps up
and provides something nice.

This overhaul should hopefully add a little variety to the chef role,
while keeping it largely unchanged in terms of difficulty.
2015-03-08 05:09:19 -04: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
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie
b8a440f23a Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes 2014-12-07 04:55:48 +01:00
Fox-McCloud
c218c1af3b Production and Mecha Tweaks 2014-12-03 18:20:51 -05:00