Commit Graph

209 Commits

Author SHA1 Message Date
Cerebulon
aa22ef3ef7 Every Food Fix 2021-01-29 10:46:10 +00:00
Mechoid
f518a31458 Hydro upkeep (#7475)
* Start work on Hydro upkeep.

* Fix Cyborg interactions with kitchen tools.

* Add Wurmwoad to the vendors.

* Map

* changeling
2020-09-16 16:38:43 -07:00
Mechoid
23c01743ca Adds Mortiferin, bumps Necroxadone in strength so the investment is more worth the result. 2020-07-31 16:28:18 -07:00
Rykka
dd3cd72908 Fix batter and all subtypes of it being unmake-able.
Add water or beer BEFORE adding egg + flour together to avoid messing it up.
2020-07-26 00:28:08 -04:00
Rykka
aaf223b256 Aurora Commit 2 2020-07-16 20:52:28 -04:00
Aronai Sieyes
715de43f35 VChat: Redone chat output done in Vue.js (#6761)
* Better notifications

* Add buttons to del/move tabs in edit mode

* Add a <span> to emotes

* Fix duplicate IDs in VChat and add more logging

* VChat: Redone chat output in Vue.js

* Ported tg asset cache

* VChat DME Update

* Replace \image macro with bicon()

* NanoUI Subsystem Fixes

Don't do this, the asset subsystem does this for you

* Allow narrate/globalnarrate shenanigans

Allows HTML if your entire thing is HTML

* Disable bicon() icon object cache, and create text tag cache

* Ore Scanner is written incorrectly

Only revealed by vchat

* Fixes 2 VChat bugs

* Underline links in VChat

* Fix LOOC color

* VChat Improvements

Hopefully, anyway.
- Arbitrary font size setting
- Line height setting
- Multiple crush settings
- Rewrote how tabs work hopefully for performance
- Hidden messages are actually put elsewhere
- Attempts to correct chat backlog restore on rejoin

* Surgery steps to use <span>

* Some VChat Tweaks

- Chat remains between client reconnects if your client didn't close (so things like using the reconnect button, or autoreconnects at round end when that feels like working)
- The client doesn't send pings to the server, the server sends pings to the client. This fixes AFK measurements for AFK kick purposes.
- Turn latency indicator into a green/red indicator to show if you're connected, and when clicked will perform a one-time ping (and block doing it again for 10 seconds). It will display '?ms' if it never got a reply, or '999ms' if it did, but it was over 1s.

* Include date in filename for VChat log save

* Merge pull request #6767 from Cyantime/patch-2

Change chat export naming scheme

* Adds VChat tab saving

Saves every time you enter/exit edit mode. Persists between rounds, VChat reloads via verb, etc.

* Fix chat exporting when someone has used unicode

Only affects clients still using 512

* Use CLIENT_FROM_VAR for ease of code reading

* Update code/modules/client/asset_cache.dm

Co-Authored-By: Novacat <35587478+Novacat@users.noreply.github.com>

* Fix runtime when client disconnects before vchat loads

* Fix polaris version of command reports

* Fix LOOC color in oldchat

* Put some styles in various adminpm messages

* Round info and advanced who spans

* Fix missing tag-end

* Maybe fix images for linux and statpanel but also doom everyone

Co-authored-by: ShadowLarkens <ShadowLarkens@users.noreply.github.com>
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
2020-03-27 14:07:28 -07:00
Arokha Sieyes
5b15917d32 to_chat replacing stream operator 2020-02-17 13:14:08 -05:00
Ketrai
6db1d29836 Ports deathbell because the recipe requires it. 2020-01-18 12:43:29 +01:00
Mechoid
d9076dbaff Xenoflora expansion take2 (#6592)
Xenoflora
2020-01-08 10:44:41 -08:00
PrismaticGynoid
d3c0c9f933 Drink fix (#6564)
Fixes the Sex On The Beach drink being unable to be made by slightly altering the recipe - it's now made using the virgin version of the drink first, to prevent it from being interfered with by the Screwdriver recipe.
2019-12-13 17:04:51 -08:00
Mechoid
e2e870f2b4 Medical Expansion (#6465)
* Starts work on the Medical Expansion.

* Further Work

* Save Everything!

* Large volume of things.

* Log of Change

* I'm an idiot.

* Kidney assisted sprites. They didn't exist, for some reason.

* Fixfix

* Fixfix

* Update encased.dm

* Update glass.dm

* Update Chemistry-Reagents.dm

I am once more an idiot.

* Split augs.

* Fixfix
2019-10-19 19:27:39 -08:00
Novacat
7f49c680e5 Ports MREs from Baystation (#6424)
* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
2019-08-31 14:00:14 -08:00
Atermonera
0069b9d980 Merge pull request #6396 from Mechoid/ChemistryAdvancement
Chemistry Expansion
2019-08-21 13:42:08 -08:00
Mechoid
f294be6c56 Exploration Expansion 1: Or, How I Learned To Love The Tree (#6358)
* Mechoid code everything!

* Telecube

* Adds 2 PoIs

* H u g e commit.
2019-08-21 13:21:33 -08:00
Mechoid
c462448da8 Introduce the Distillery, a few recipes, and new chemicals. Introduce chemical patches, which apply on-touch chemicals, and can be dissolved a la pills. 2019-08-07 20:49:24 -07:00
Cerebulon
521e06d3f9 Salt is Salt 2019-07-13 07:16:47 +01:00
Mechoid
e5b7e11206 Update Chemistry-Recipes.dm 2019-07-04 13:42:42 -07:00
Mechoid
71541c9806 Mo drinks n stuff 2019-07-02 16:59:18 -07:00
Mechoid
36fd0198e7 Starts work on CIVILIAN EXPANSION 2019-06-26 16:04:37 -07:00
Mechoid
e1876dcd02 Fishing and all its wonders, Ft. World Server code bastardization. 2019-04-17 23:41:03 -07:00
Schnayy
5e96a1c1be Fixes drinks and adds new one. 2019-03-05 22:46:07 -06:00
Atermonera
644978ea1c Merge pull request #5846 from Mechoid/ChemicalsChemicalsChemicals!1
Adds multiple organ-related chemicals.
2019-01-31 20:42:47 -08:00
kevinz000
46c79c7d3e [READY]Makes a bunch of processes subsystems instead (#5814
* Converts various New() definitions to Initialization()
* Adds absolute pathing
2019-01-15 22:58:06 -08:00
Mechoid
0db38cb75b Wooooooork 2019-01-14 21:34:35 -08:00
Heroman3003
8b6a62a496 Adds eggnog. 2019-01-08 12:31:42 +10:00
kevinz000
84ea3c0931 JFC 2018-10-14 19:45:38 -07:00
Mechoid
b3f40308ca Adds some Holy drinks, and Promethean-safe drinks / acclimators. (#5574)
* Adds some Holy drinks, and Promethean-safe drinks / acclimators.

* Carbon + Water + Oil = Sludge

* TRUEFALSE & * removed
2018-09-22 18:53:55 -05:00
Anewbe
c72807f458 Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter (#5355)
* Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter

* Changelog

* Corrects liver cost oversight
2018-06-16 10:41:20 -07:00
Atermonera
6adbe5537e Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear
Adds permanent markers
2018-03-28 11:49:10 -07:00
Anewbe
3df290f46f Ports antibiotics overhaul (#5050)
* Ports antibiotics overhaul

* Update the rest of the places "spaceacillin" is used where antibiotics is meant.

* Antibiotics port compiles
2018-03-22 09:55:49 -07:00
Billy Bangles
05fd53ebcc adds permanent markers
also tweaks paint recipe to use ink instead of crayons.
2018-03-19 20:20:31 -04:00
Arokha Sieyes
4a6a6d5742 Prevent infinite deuterium 2018-02-15 02:34:42 -06:00
SunnyDaise
10490fa5b4 Food and Drink: Additions and Bugfixes (#4598)
* Food and Drink
2018-01-21 22:18:33 -08:00
Cerebulon
a5de13cdb9 Fixes duplicate tea recipe.
Also a bunch of extremely minor drink typos.
2018-01-20 01:53:50 +00:00
mistyLuminescence
c443875898 Dropper and bloodpack improvements (#4453)
*Droppers transfer fractions adding to 1

*IV packs can be relabeled
2017-12-31 11:49:20 -08:00
Mewchild
e97b301838 Take two. New drinks (#4259)
* Adds new drinks

Adds many new drinks. Adds bitters, a staple for mixing.

* Fixes errors.

Also shut up travis :c

* Fixes Bitters/Buracao conflict

Makes it so that bitters require water and more enzyme, to avoid a
conflict with Blue Curacao

* Bitters use mint instead of orange

A more elegant solution to my last

* Removes duplicate

Rotgut was defined twice.

* Another duplicate

Mojito got defined twice.

* Adds Cold Front

Cold Front - 1 Iced Coffee, 1 Whiskey, 1 Mint. Lowers body temperature
by a severe amount. (Functionally the opposite of antifreeze)

* Fixes spacing issues

Changes Four Space to Tab indent

* Requested changes

Makes new milkshakes children of milkshake
Lowers Named Bullet slime jelly to 0.25u, down from 2u
Fixes a mismatch in amounts on the mint julep

* Fixed undefined drinks

Defines Mint Julep and Love potion
2017-12-09 16:25:06 -06:00
Anewbe
73ca1f1803 Less meat from Clonex+Blood 2017-09-29 16:48:02 -05:00
Belsima
356d551ace Adds a pair of Skrellian drugs. (#3849)
* Adds a pair of Skrellian drugs.

* Fixes talum_quem damage.

* i copypastad wrong and now it wont compile

* Adds nicotine to cigarettes.

* Revert "Adds nicotine to cigarettes."

This reverts commit f7640f1142.
2017-09-17 19:09:20 -05:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Anewbe
41e199cb92 The drink Balloon can now be made 2017-07-26 18:57:29 -05:00
SilveryFerret
c8fc6f25e5 Oxyphoron change proposal (#3634)
* Changes oxyphoron to hydrophoron

* Stops hydrophoron magically producing oxygen

Instead, it creates a spark when it's tossed on the ground., and shoves
phoron into the air. Hooray!

* Change hydrophoron touch_turf proc at Anewbe's request

* Missed a /2
2017-07-25 16:44:30 -05:00
silveryferret
ad5cfd0087 Fixes Chemistry-Recipes.dm.
Not 100% sure how this happened, mergetool must've screwed up somehow.
2017-07-19 23:22:36 -04:00
silveryferret
3d3ff303c7 Adds missed Oxyphoron reaction, moves Deuterium/fifty into obj/fiftyspawner/deuterium 2017-07-19 23:14:15 -04:00
silveryferret
7567726c07 Ports R-UST from Baystation12 + small admin debug verb 2017-07-19 20:33:16 -04:00
Belsima
a3319de4f4 Adds a load of lore-friendly drinks & adjusts existing descriptions. (#3588)
* adds a load of lore-friendly drinks

* changelog

* uncomments radioactive drinks

:(

* nuka cola comeback

* Fixes the pull request.

* Makes drinks a bit more powerful.
2017-07-18 22:28:35 -05:00
Anewbe
28c4d5a4d8 Stimm recipe changed 2017-04-21 22:05:14 -05:00
Cameron653
77f6d2fd78 Makes Carthatoline actually creatable
The ID for dylovene is "anti_toxin" not "dylovene"
2017-04-02 01:26:40 -04:00
Yoshax
6b794bb9d7 Small tea drinks bugfix 2017-04-01 14:10:32 +01:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00