Commit Graph

177 Commits

Author SHA1 Message Date
SonixApache
451af76df9 Lesser chems (#26782)
* Mannitol, Deitine, gatormix, magica

* blisterol

* make it compile

* ye

* less crappy, more ghetto

* this makes more sense

* mannitol fix

* magica deluxe

* blisterol recipe carbon -> copper

* comment

* one line less
2020-06-19 18:39:46 -03:00
Kurfursten
0d7687bcc3 Merge pull request #26437 from BomberBro/inhandupdates
Adds a bunch of in-hand icons
2020-05-12 09:10:19 -05:00
Bomber Harris
cf03514a81 adds inhands 2020-05-10 17:29:59 -04:00
Kurfursten
9867343a91 More Trader Stuff (#26346)
* More Trader Stuff

* updates
2020-05-10 05:11:41 +02:00
adrian
55e4d01709 Fixes a pair of runtimes (#26210) 2020-04-17 17:31:52 +02:00
DamianX
a729001002 Spess.TV Season 1 (#26083) 2020-04-01 00:15:24 +02:00
ancientpower
88cc07398c sliding runtime fix (#25792) 2020-02-02 11:25:04 -03:00
Wew-Laddie
a3d7caf0aa Adds a new sodie pop and a caffeine reagent for later use (#25225)
* Added caffeine reagent

* Added 'Roentgen Energy', a premium item at Robust Softdrinks.

* Added a new slogan

* Removed overdose and heart attack. Added increased appetite

* Changed reagent description and added pronoun

* Move item from Robust Softdrinks to Groans Soda
2019-12-09 19:19:50 -03:00
jknpj
1b2a4aac07 Merge pull request #24978 from Zth--/cleaningDuplicates2
Cleaning duplicated procs, part 2
2019-11-13 09:41:31 -03:00
ShiftyRail
b60298bdd3 Far sliding (#24915)
* Far slide

* Three tilesé

* Parenthesis

* c'mon

* span class
2019-11-12 12:52:21 -06:00
Adrian Dias
4122bcae07 ok I'm tired. Cleaning duplicated procs part 2 2019-11-11 21:10:35 -03:00
bonk
0b4e43ebec 20+ new cocktails, 6 new types of booze, one modified/redirected sprite 2019-11-01 23:14:44 -04:00
SonixApache
e16bc8e1bb canned cop coffee 2019-10-28 22:08:36 +01:00
Shifty/Anthomansland
307716a1ca Can now slide drinks accross tables 2019-08-24 23:49:47 +02:00
Shifty/Anthomansland
48a9124176 Drink sliders 2019-08-24 22:21:58 +02:00
madmanmartian
bce7b0d251 Standardizes reagent examine code
So reagents that obscure reagent examine are worth a damn, and the funny hallucination text comes up more
2019-07-22 00:31:43 +01:00
DeityLink
83bc6c01d5 gah 2019-07-05 16:04:10 +02:00
DeityLink
efcb37613d better 2019-07-05 15:37:09 +02:00
DeityLink
350be17e12 for good measure 2019-07-05 15:37:09 +02:00
DeityLink
470a836eb5 crushed 2019-07-05 15:37:09 +02:00
DeityLink
6edf9efbec hyuck hyuck hyuck 2019-07-05 15:37:09 +02:00
DeityLink
f9ab48c55c can crusher 2019-07-05 15:37:08 +02:00
Kurfursten
5324e5acfb Merge pull request #23374 from MadmanMartian/bear_beer
Bear pun
2019-07-05 03:42:07 -05:00
madmanmartian
bac4a0f9c3 Bear pun 2019-06-30 15:26:33 +01:00
madmanmartian
76ff3d491e Removes armor RNG, now they're just a straight percentage of damage reduction 2019-06-20 13:03:18 +01:00
otatoh
da55351683 Fixes a missing gender check (#23029) 2019-05-25 12:36:34 -03:00
I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE
7c1e9cde80 Adds Gunka-Cola and Dr. Pecker's 2019-05-11 23:29:59 -03:00
brndd
00ead3c06f adding sake sprites and a new cocktail for it 2019-04-16 03:16:52 +03:00
DamianX
5ab48b6544 You can bite-intent attack drinks to drink them (#22313)
* You can bite-intent attack drinks to drink them

* Pills too
2019-04-11 16:51:55 -03:00
DeityLink
239c19951e The Ultimate Bartender Power Creep (#21816)
* theultimatebartenderpowercreep

* discount shakers
2019-02-24 07:27:24 -03:00
SonixApache
8abf081e8f tomato soup premium item for coffee machines (#21704)
* tomato soup premium item for coffee machines

* but it did, and this should remove it

* dream maker is a very good program

* confligds
2019-02-20 03:46:52 -06:00
SonixApache
d9f35ab750 adds canned coffee as premium soda machine item (#21708)
* adds canned coffee as premium soda machine item

Just like on Mars!

* ">no brand" he says
2019-02-17 08:29:10 -03:00
SonixApache
96c3b38b11 adds ice cup sprite 2019-02-15 10:00:22 +01:00
RealestEstate
978ff1d1cf Fixes some issues between code and pre-existing sprites (#18759)
* fixes misc spriting errors.

* cleaner inheritance and removes tiny-testicles

* image first checks for opaque var before creating image.

* fixed conflicts and removed my unnecessary bugfix.

* switches tiny_test back to box

* manually fixes conflicts in drinks.dmi

* should fix drinks.dm conflict maybe

* should hopefully maybe please fix the dmi conflicts

* manual fix commit

* adds changes to drinks.dmi

* removed scalpel changes
2018-09-29 21:56:13 +02:00
Allspice
6c9558b49f Implements new fossilized plant features and related chems. (#19303)
* Implements new fossilized plant features and related chems.

* Make spiders from the drink spawn under the imbiber.
2018-08-23 06:24:21 -03:00
Exxion
3c8ab4bc30 Fixes Molotov logging and bottles breaking (#18481)
Actually does NOT fix Molotovs breaking, due to a BYOND bug, but if that bug gets fixed then it will
2018-06-11 18:59:12 -03:00
ihadtoregisterforthis
0777921bd7 Cup Ramen self heating again (#17870)
* barely better than just changing the cup description

* now with three times more bubbling

* homecooked is just not the same

* By the power of copypaste I command you to cough

* full body burns?
2018-04-27 15:40:51 -03:00
Arthurdentist
44180cef2d fixes bug with Mime Equipment (#17966)
* fixes bug with mimes

* description wasn't updating before, should work now.
2018-04-01 07:42:55 -04:00
EdXbtkOEwGw
e2b4184551 Better logging for molotovs and conversions (#17028)
* Better logging for molotovs and conversions

* very dirty conflict fix maybe

* Better logging for molotovs and conversions
2018-01-09 21:32:47 +01:00
MadmanMartian
f028b641b5 [WiP] [DNM] [Gone Rogue] [Need more suggestions] chem heating part 2 (#16475)
* better bunsen burner sprite, more heating/cooling recipes, fridges now actually cool things down.

* Ramen needs hot water now

* Defines for the bunsen burner

* no going to negative kelvin, please.

* temperature now goes back in time. Bunsen burners now check for if there's a held container first, before forcemoving a held beaker into the nth dimension. Adds a prong overlay over the beaker overlay so it looks like it's held.

* removed test_tiny from my dme

* adds densities & SHCs to a lot more chemicals that have recipes

* fixes Ice spawning and instantly becoming water. Changes some more densities n SHCs to 2DP
2017-11-18 22:59:09 +01:00
jknpj
80937eeddc Grippers ACT2 (#15865) LET IT ALL BURN
* Grippers 2

[insert eletric bogaloo meme]

* watafuk

* not used.

* ops

* Makes Beer2 more expensive

* removes the sheet inserter board

* Adds sheet inserter to supply

* fucking --force

* OPAQUE

* G.wrapped

* Good point.

* prevent

* I'll test this later.

No really, i will.

* You got a point

* JUST GO FOR IT

adds the food bag back because what the fuck

* Anomaly goes from 1 to 10

* oops

* we back

in black
2017-11-02 18:31:59 -07:00
Unknown-as-Captain
cc98a6d1a9 Fixes molotovs not working when hitting anything except a floor (#16372) 2017-11-01 08:20:35 +01:00
Unknown-as-Captain
4e294707f6 Adds two Syndie bundles (#16369)
* Adds two Syndie bundles

* Increases chances of super-rare bundles

* this exists but is never used
2017-11-01 08:18:45 +01:00
MadmanMartian
8bfd04b3d4 [NEEDS REVIEW] adds chemical heating (#16116)
* adds heating as a way of making chemicals through recipe

* adds density and SHC of found base elements. Adds more true-to-life heating

* adds defines for source_temperatures on hot objects, remakes the heating proc so it works according to the laws of physics

* conflict fixes

* fleshes out the bunsen burner. Adds an alteration to the dump chemical reactions proc that dumps general chemical information

* adds a thermometer for measuring the temperature of reagent containers, tweaks the bunsen burner values a bit, adds some more densities and SHCs

* Adds being able to construct and deconstruct bunsen burners

* adds the thermometer to the medvend, advanced thermometer to research, resizes the thermometers to be pocketable, et cetera.

* requested changes

* removes the chemistry diagnostic verb entirely, rather than leaving it commented out
2017-10-31 17:50:30 -05:00
Valkyrie Skies
52913a2238 Adds the Offworld Off-Licence vendor, a vendor serving various alcoholic beverages in cans. 2017-08-11 01:21:00 +01:00
Skullyton
84651d02a1 Adds Greyshirt vodka 2017-04-01 19:46:32 +01:00
Skullyton
d5f5f88787 donut dipping (#14271)
* donut dipping

* No more dipping if the glass is empty

* Makes dipping its own proc, which drinks calls on dip
2017-03-12 04:28:50 -04:00
L.E.D
bd17925063 Bleach (#13999)
* bleach

* BLEACH

* DRINK IT

* BLEACH IT ALL

* xd

* k

* inb4 bleach grenade powergame

* sad fix

* lungs sanity

* remove pointless inheritance

* better

* discount disgust

* absolutely disgusting

* whoops gotta include this too

* aa

* whoopsies

* preventing unholy spam
2017-02-17 08:01:10 -05:00
Shadowmech88
4788701d90 Undupeable Reagents (#13916)
* Adds the dupeable var to reagents to govern whether they can be duplicated by means such as the oddyseus syringe gun and the service borg shaker.

* Makes ground phazon non-dupeable.

* Fixes typo, causes scanning error message to display when failing due to reagent state as well as the dupeable var.
2017-02-17 05:44:32 -05:00
Skullyton
4741e677dc Drinking (#12719)
* Can now drink from regular bottles

* Good spot, comic

* Redo logging

* remove removal of LAssailant, removes spam

* Reagents are now drank in 5u or less, unhardcoded
2016-12-27 19:36:24 -05:00