Commit Graph

57 Commits

Author SHA1 Message Date
Mieszko Jędrzejczak
4692f3f0a4 Shoots glasses 2016-04-14 20:54:02 +02:00
Mieszko Jędrzejczak
965ec810e7 Holy water glass looks like water, IPC booze makes organics puke, more synth drinks 2016-03-12 15:39:29 +01:00
Mieszko Jędrzejczak
8fd46ab566 Synthanol can sprite 2016-02-23 00:03:15 +01:00
Mieszko Jędrzejczak
905fb6863c Added files via upload 2016-02-21 13:39:36 +01:00
Mieszko Jędrzejczak
23d33051fb Beep Boop IPC booze 2016-02-21 13:19:18 +01:00
SamCroswell
ba4f3d701e Coffee, Coffee, Coffee 2016-01-09 17:55:00 -05:00
Markolie
e96103a02b Fluff item clean-up 2015-09-25 04:31:30 +02:00
Markolie
d8f98d6082 Add dmisort.sh script, and sorts all icons in .dmi files 2015-09-17 01:08:58 +02:00
Fox-McCloud
1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
Fox-McCloud
837538ce95 Reverts a Few Chem Changes 2015-04-27 17:41:13 -04:00
Fox-McCloud
aaf3be77fb New Vending Machines 2015-04-13 03:27:41 -04:00
Fox-McCloud
ddc3604442 Merge remote-tracking branch 'upstream/master' into more-reagents 2015-04-07 01:15:06 -04:00
Fox-McCloud
68a8340b23 [Goonchem] More Reagents 2015-04-07 01:03:15 -04:00
Fox-McCloud
9ca8def744 [Goonchem] Fixups 2015-04-05 21:56:59 -04:00
SamCroswell
02638d1a60 Adds admin boozes 2015-03-22 21:54:49 -04:00
DZD
cada511cb7 New Coffee Cup Sprite and New Canister
-Replaces coffee cup sprite with sprite by Nienhaus
-New atmos canister with sprite by Nienhaus, white base with red
stripes, useful for making custom mixes in order to avoid carrying
around a large yellow HAZARD tank.
2014-11-12 22:15:26 -05:00
jack-fractal
4045df96a5 - renaming existing "tea" icon to hot_coco
- adding "teacup" icon
- revising icon-state for hot coco and tea
2013-06-19 00:47:12 -04:00
jack-fractal
73d9cc8c3f - adding Malsquando's teacup replacement sprite 2013-06-17 00:03:44 -04:00
jediluke69
85eb0f1224 Adds new drinks and fixes a few things 2013-04-24 18:49:01 -04:00
fauxtada
c1991ba0dd Player Requests Edition
- Two canes will spawn in medbay storage for people with leg injuries.
- Added some more welding goggles for engineers in engineering.
- Armory has a second security hardsuit.
- CMO has hallway access to the medbay hardsuits.
- HoS hat spawns in HoS closet.
- White wedding dress spawns in chaplain closet.
- Removed Pulse Rifle and Laser Canon from ERT room.
- Detective's office will now start off with a cigeratte pack and a detective's flask.
- Three normal boring flasks now spawn behind the bar for the bartender to give out.
- Old Man Suit spawns in laundry room. - Requested by Book.
- Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right.
- Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in.
2013-04-24 03:04:35 -07:00
Chinsky
be67a9b3a7 Readded missing icon for absinthe. 2013-01-28 18:55:44 +04:00
johnsonmt88@gmail.com
fa1d2bb873 Commit for Giacom:
Breaking bottles over people's heads!
- The bottle will be destroyed and a broken bottle will replace the old bottle
- There is a chance for a glass shard to be created
- The regents of the bottle get splashed onto the mob who got hit
- This affects alcoholic bottles, not to be confused with pill bottles or chemistry bottles.
- - Technically milk cartons and lime juice cartons, so they break as if they're glass.

Names in the PDA list are now ordered alphabetically.

Changelog updated

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3998 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-06 04:31:35 +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
7eadbf3460 -Recipe updates for some booze in an attempt to resolve recipe conflicts. I think I got them all, please notify if any remain.
-Corgi Techs!
-Added animation to splashy puddles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3604 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 03:19:40 +00:00
d_h2005@yahoo.com
8afca8ac7f -New booze sprites for the drinks that were removed. Re-enabled the recipes for the removed drinks.
-Drinking the Antifreeze booze makes you warmer. Duh.
-You now need 10 sheets of metal instead of 2 to make a gas canister, people can't FILL ENTIRE ROOMS WITH THEM. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3564 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-07 01:56:25 +00:00
quartz235@gmail.com
84fd498ffb Fixed some icon states with (unused) in them that were causing invisble drinks.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2730 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-18 04:29:01 +00:00
polyxenitopalidou@gmail.com
d8991f9d25 •New sprites added, the work of veyveyr: New large grenade, new formal black jacket (spawns in the laundry room) and new screwdrivers.
•Airlock electronics now tiny
•Marked unused drink sprites

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2276 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-26 23:52:16 +00:00
tronaldnwn@hotmail.com
7de17034a5 Delicious Nuka cola is back, with a bottled sprite for its glass (don't question why it turns a glass into a bottle and back again, it is just physics).
Seriously don't remove ice cups from the booze O mat, it is meant to use a cheap Styrofoam cup as its sprite (that's the look I was going for when I made it, after all.. what else would you use?).

Synaptizine is now useful. It reduces weakness/ stun/ silence/ drowsiness/ paralysis to zero. Meaning you can't be stunned, or knocked down for more than a moment. it is great for when a rogue borg rolls around or if you need to revive some one who was stunned by a shocked door (but not killed by it) or if you just need to get away from those dang security officers. It'll do more too, but it is pretty much anti-zombie powder (just it can't cancel the toxic effects of zombie powder).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2143 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-06 08:11:08 +00:00
polyxenitopalidou@gmail.com
16b68a4c8c •Removed the badly sprited drinks, left the good ones in. Check here for the actual changes.
•Boozeomat no longer vends that retarded icecup thing
•Cleared up and shaded a lot of drinks and bottles. New caccavo tequilla bottle.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2136 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-05 22:00:34 +00:00
vageyenaman@gmail.com
320ef1dd22 New virus called Retrovirus. It scrambles your UI and SE after a certain stage.
Implemented CTRL+DIRECTION KEY to face a direction.

Tweaked some drink icons.

Added in two new icon_states to genetics.dmi. It doesn't do anything yet, but I might toy with them later on.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1954 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-30 18:57:37 +00:00
firecage@hotmail.com
d1b3c809e4 Added some new drinks to the bar. This includes Erika Surprise, Anti-freeze, snowwhite, syndicate bomb, irish car bomb, devils kiss, demons blood, changeling sting, booger, barefoot, aloe, andalusia and alliescocktail.
Added monkey suit and sexy mime suit to theatre costume storage. Credits for sprites goes to Pybro.

Added the holy flask into chaplains office.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1908 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-23 01:58:54 +00:00
firecage@hotmail.com
6bc651f9ab Added a new chef utensil named the Butcher's Cleaver. For now it functions like a kitchen knife, but it does slightly more damage and can only be gotten from a hacked/emagged kitchen vending machine.
A few new foods are added, namely the following. Brain Burger, Chocolate Egg, Mystery Soup, Sausage and Fish Fingers.

Service/butler cyborg has a new sprite to pick from, the Maximillion one.

Chaplain now has a Flash of Holy Water in his office using the new holy water reagent.

Chef also now has an alternative apron he can find in the kitchen vending machine.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1882 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-18 18:25:03 +00:00
firecage@hotmail.com
1def6c7bc5 A new reactent is added called Nothing. The mime also starts with a Bottle of Nothing.
The barman can now make a drink called Silencer, which uses Nothing, Cream and Sugar. This can only make mimes drunk.

Chef has a few new recipes. Blood soup, Clowns tears, twobread, Metroid Sandwich, Metroid Burger, Chocolate Cake, Lime Cake, Orange Cake, Lemon cake, Boiled Metroid Core and Spess Law.

Captain has a new item in his office named Chain of Command.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1863 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-16 17:44:37 +00:00
vageyenaman@gmail.com
f14f4a3948 I, um, added some... lemon-lime soda that serves no purpose and is not found anywhere in the game, unless admin-spawned. Handy!
New AI Traitor Objective: No humans must escape alive on the shuttle! This is a not-so-common objective.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1846 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-14 02:43:56 +00:00
tronaldnwn@hotmail.com
ecb5c6d65c Food reagent updates because of stuff.
Sugary plants, blend them for sugars.

Foods Sugar packets are removed, coco paste removed (it is now a reagent), and crushed leaves are removed (due to not taking advantage of the potency system).

Blend Coco Pods for Coco! Then add sugar and milk (or soymilk) for a chocolate bar! Or add water for hot chocolate (chocolate milk TBA). Crushed chocolate renamed crushed coco (is a reagent).

Kitchen closet has a condiment bottle of sugar in it now, rather than a billion packets of sugar.

Candies apples use 5 units of sugar now, rather than a pack of sugar.

Modified some new hydroponics plants to take advantage of the potency system.

Had a go with a few drink bottles in party crates that weren't showing up due to a typo!

Feed Nuka Cola to humans or animals and they won't just spaz out, they will spaz out so much not even the cold can slow them down.

Deleted some redundant reagents (there were two lime juices, two creams, and I forget what else). Rearranged a few reagents. Capisin and frost oil never added nutriment factor to start with, and they really shouldn't. That's pretty much it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1839 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-12 06:20:12 +00:00
firecage@hotmail.com
2fa096add2 Note: This will be the last mundane plant for a LONG time. Next shall be various mutations, fantasy, sci-fi and custom plants.
Hydro can now grow cocoa trees and harvest cocoa pods.

The chef can process the cocoa pods into cocoa and process that into chocolate bars. He can also put the chocolate bars into the blender to get crushed chocolate, which the barman can use.

Lemon, watermelon, poison berry juice and crushed chocolate is added to the reagents list.

Barman can now also serve a chocolate drink. He can also now serve Lemon, Watermelon and Poison berry juice as drinks.

Poison Berry was made a mutation of berries.

Nurse uniform was now also fully fixed.

PS. Poison berry was added to the juicer machine as well.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1833 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-10 23:14:57 +00:00
firecage@hotmail.com
988f795be2 I added in three new clothing pieces. A chicken suit, a Holidaypriest suit and a nurse suit and nurse hat.
I added the holidaypriest suit and the nurse suit and hat to their respective lockers in chapel and Medbay. I also placed the chicken suit in the theatre.

Barman has a new drink named Singulo and Carrot Fries and Meatball spagetti was fixed.

Thanks goes to Farart for all these great sprites. So thanks Farart.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1806 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-08 20:53:39 +00:00
rastaf.zero@gmail.com
b63a4c241e Fixed cpu lock when low pop revolution fails to start.
Fixed some runtime errors.
Improved golden cup.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1804 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-08 20:25:08 +00:00
Superxpdude@gmail.com
82bfc391e1 Added in some new food and drinks. Credit goes to Firecage for all of the work except the actual commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1799 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-07 23:50:45 +00:00
vageyenaman@gmail.com
bbff7d304b Craftable Beverages:
There are about 12 new drinks added in, courtesy of Firecage. There are a bit too many to list!

Maps:
     Some map fixes, courtesy of Petethegreat.


Thanks guys!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1788 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-06 19:20:39 +00:00
Superxpdude@gmail.com
191e4ac44d Added in some new drinks by Firecage.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1781 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-06 01:10:45 +00:00
vageyenaman@gmail.com
ebcdc09c10 There's a few things in this revision made by me, and some made by other people that
requested I commit into the SVN. Please PM the collective coders if you find any bugs in 

their work.


AI:

     The AI now has a verb that lets it change its appearance. It doesn't do much, but but 

it's some neat aesthetics that compliment the little display panes scattered around the 

station that the AI can modify. This was a combined effort between Firecage, Petethegoat, 

and Superxpdude.



Miscellaneous Changes (by Petethegreat):

     - Cup Ramen sprite changed to a nicer one by Cheridan
     - Plasma sheet sprite changed to a thicker one by Aru




Metroids:

     They work. There might be some lingering bugs I simply cannot catch by testing alone, 

but they WORK. They act as an entire new player-controllable race, are found in 

xeniobiology, and I refuse to say anything else on the matter that would spoil anything. If 

you feel so entitled to, you can view the source code to spoil everything like a little 

cheater! I haven't completed everything I would like to, and as a result Metroids are 

pretty useless. They're still very fun though!

     Xenobiology, as a result of Metroids, got a bit of expansion. Scientists have access 

to Xenobiology now, for now. If anyone wants Xenobiology to become a standalone job or 

whatever, here's the place to post feedback.


Bugfixes:
     
     - Perriot's Throat virus no longer makes you mute, instead, does what it was intended 

to HONKHONKHONKHONK!!!!
     - Some bugfixes with Turrets.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1774 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-05 19:34:42 +00:00
tronaldnwn@hotmail.com
6b3476ed20 Syntiflesh update:
- Syntiflesh is going to be used in surgery to give people new faces.
- syntiflesh can be used in any recipe that requires normal meat.
- syntiflesh is made from 5 units of blood and 1 unit of clonexydone.

Plasma as a catalyst
-5 units of Plasma will be required as a catalyst in: Dexalin, Clonexydone, and Lepozine (requires copper as reagent now).
-NOTE: Catalysts are not consumed in reactions!

Clonexydone and cryoxydone
- result per reaction is three (it used to equal 10 per 3 unit reaction, that made no sense).
- Cryoxydone remove a slight amount of cloning damage at 170K.

Drinks 
- 4 new drinks! Atomic Bomb, 3 mile island ice tea, patron, and goldschlager!
- Look in the recipe code for how to mix each of them up.

Sprites:
-Added new Ore sprite for uranium, by Aru
- Drink and bottle sprites by Aru
- Manipulated Atomic bomb (drink) sprite from Aru and me.
- Unused yellowcake sprite (I need to tweak it a little more)

Food 
-Stream lined some food (removed WATER Reagents)
- Modified the nutriment value of other foods based on ingredients.
-Remember, Amanita is a poisonous mushroom! And, food made from it is also toxic.

Several new and exciting items added to reagent grinder:
-Bananas, carrots, liberty caps, chili peppers (ice too), and nettles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1742 316c924e-a436-60f5-8080-3fe189b3f50e
2011-06-30 07:24:33 +00:00
rastaf.zero@gmail.com
f639ece55d Update for game masters:
-Right click commands "Make robot/alien/ai/monkey" moved to "edit player" screen.
-Right click commands "Make traitor/cultist/changeling/etc" moved to "edit mind" screen.
-- note: currently the only way to humanize monkey is to use "edit mind" screen.
-Added right click commands showing "edit player" and "edit memory" screens.
In light of an incoming tournament on ss13.ru I have added "Select equipment" right click command. It allows to instantly dress mob as you wish. Coders, feel free to add more dress packs, like "centcom inspector", "space pirate" and so on.
A strange command "list_occ" now called "List free slots" and shows unoccupied jobs.
Added golden cup, sprite belongs to Farart.

You can now take a power cell from charger even if there is no power.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1724 316c924e-a436-60f5-8080-3fe189b3f50e
2011-06-25 11:30:05 +00:00
uporotiy
26e33a0a3c A couple of small changes before I tackle the buffing-up project.
Luminosity
Admins editing the luminosity var now properly uses sd_SetLuminosity().
 Britcup
A cup spawns for Kingston in hydroponics.
 Taser guns
New sprites, courtesy of Arcalane. Now with an actual 4-shot gauge!
 Interface
16x16 mode re-enabled for shits and giggles.
 Mining
Reverted the uranium ore sprite.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1507 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-29 14:27:49 +00:00
rastaf.zero@gmail.com
9b2e9c3420 Fixed bugs:
Players now cannot rejoin the game if their mobs were gibbed/burned while they were disconnected.
Cremating/gibbing for meat now counts as death with triggering log records, gamemode checks, sql reports, etc.
Fixed some bugs with enabling verb ghostize().
Fixed bug with DNA Machine popping out from the protolathe.
Fixed bug with tuning RSD.
Added juicer:
	berry -> berry juice
	banana -> banana juice
	tomato -> tomato juice
	carrot -> carrot juice
Bug your botanists for getting better potence for more juice.
Juicer can be pulled, chef can give it to barmen or botanists.
Blender changed a bit:
	tomato -> ketchup
	corn -> corn oil
	soy beans -> soy milk
	any food -> nutriments and contained reagents.
Sound for the juicer found at http://www.freesound.org/samplesViewSingle.php?id=98053, edited by Nikie.
You can eject ingredients from the microwave. However, you cannot get back your reagents, they will be lost and can make microwave dirty.
Essence of Banana was renamed to Banana Juice.
Added Carrot Juice. Heals eyes much slower than imidazoline.
Carrots now contain imidazoline (however, carrot cake contains more imidazoline).
Potency for peppers, tomatoes, carrots and druggy mushrooms should work now.
New cocktail "Bahama mama": 2 rum,  2 orangejuice, limejuice, ice.
Changed recipe for soy sauce: 4 soy milk + 1 acid.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1477 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-20 14:44:13 +00:00
rastaf.zero@gmail.com
77b6bfce7d Food update from Farart:
Replaced some sprites.
Added:
-popcorn (corn in microwave)
-tofuburger (tofu+floor in microwave)
-carpburger (carp meat+floor in microwave)
Unchecked files restored.
Reagents now transfers proportionally without rounding. Popcorn's bitesize=0.1 works correctly.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1267 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-24 14:17:45 +00:00
baloh.matevz
f9460f5c3c Added tea to coffee machines (now called warm drinks machines)
Reagent code by Microwave, sprite by matty406

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1196 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-17 00:40:39 +00:00
polyxenitopalidou@gmail.com
3c071bbec6 Minor sprite update and typo fix. Sorry, but I can't stand "it's" when it should be "its"
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1154 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-03 12:46:28 +00:00
KFFFF00
b8dbdd30e1 Update to the cultist mode:
Some bugs fixed.
Converting people doesnt give new words anymore.
Sacrificing people does. You can sacrifice a living person, a dead body, an alium or a monkey. 3 cultists must chant together to sacrifice a living person, but the chances to obtain new word are higher when you sacrifice living humans.
Also putting berry joice in a glass now works properly, instead of making it a "glass of...what?"

Highly untested, so come revise this and try to find any problems.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1069 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-19 01:13:42 +00:00