Commit Graph

316 Commits

Author SHA1 Message Date
Trexdude
298c9a5f0f Fixes Bagel Poppy Recipe
Such that crafting it using a microwave actually spawns a poppy bagel, instead of a raisin bagel.
2020-01-24 18:38:06 -05:00
Schnayy
0b8ca6267d Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644) 2020-01-23 20:50:53 -08:00
Mechoid
a26cf77c52 Convert The Cake to microwave recipe type. 2020-01-20 21:06:31 -08:00
Mechoid
fff1438a50 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into TheGreatMicrowaveMigration
# Fix Conflicts:
#	code/modules/food/kitchen/microwave.dm
2020-01-20 21:03:57 -08:00
Atermonera
0dbcdf6e55 Merge pull request #6628 from Ketrai/cakebranch
Adds a mega cooking recipe
2020-01-20 20:14:07 -08:00
Mechoid
274b1e06ac Moves microwave recipes to their own subtype of the recipe datum, freeing it from the torment of being used solely for food. 2020-01-15 23:46:05 -08:00
Ketrai
18bbffd969 Removes the fishmeat from the recipe. 2020-01-15 22:38:23 +01:00
ketraiski
9708c864a5 Have it your way travis 2020-01-15 16:43:27 +01:00
ketraiski
19c2155360 appease travis 2020-01-15 16:36:18 +01:00
ketraiski
f4c299f036 confused.jpg 2020-01-15 14:50:55 +01:00
ketraiski
33247b7aaa indentation fix attempt 2 2020-01-15 14:43:42 +01:00
ketraiski
4d42d212b8 indentation fix 2020-01-15 14:27:11 +01:00
ketraiski
31cd94617b Adds a chaos cake 2020-01-15 14:02:10 +01:00
Shadow
6088899908 Round One 2020-01-11 02:25:38 -06:00
Cerebulon
f3e3703aae Coffee Shop Revamp (#6559)
* Adds bagels and decaf coffee

* Remaps the coffee shop to be a bit more appealing to visit.

* Map merge fuckery.

* Map merge fuckery. also changelog.

* took out blank line just in case

* why did the dmi do that

* revert unintended revert
2019-12-22 19:53:11 -08:00
Rykka
493b83d5a0 Update Chat System to use to_chat(src, "") instead of src << "" 2019-10-28 15:22:32 -06: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
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
Heroman
da32ae5b35 Makes magic creation of carpotoxin via cooking impossible 2019-08-14 11:04:45 +10:00
Nalarac
88e79b30c5 Adds NOCONDUCT to Some Items 2019-08-07 09:46:39 -05:00
MagmaRam
02ae1026f5 Fixes the metamorphic glass sprite for the B-52 2019-07-26 17:50:19 -05:00
Atermonera
a0bfb917a0 Merge pull request #6308 from Heroman3003/kitchenfixes
Fixes some kitchen screwery
2019-07-21 20:41:29 -08:00
Heroman
63f70a8a2c Fixes some kitchen screwery 2019-07-18 21:27:47 +10:00
Cerebulon
521e06d3f9 Salt is Salt 2019-07-13 07:16:47 +01:00
Mechoid
c2d4966cba Merge branch 'master' of https://github.com/PolarisSS13/Polaris into CivilianExpansion1 2019-06-26 16:17:58 -07:00
Mechoid
36fd0198e7 Starts work on CIVILIAN EXPANSION 2019-06-26 16:04:37 -07:00
GeneriedJenelle
5c7c959949 Adds Cider Bottles (#6201)
* Adds Cider

How has SS13 alcohol gone on so long without cider? Let's fix that.

* Update cartridge_presets.dm

* Update dispenser2_energy.dm

* Update dispenser_presets.dm

* Adds cider bottle sprite + adds to borgs

* Update Chemistry-Reagents-Food-Drinks.dm

* Removes additional cider entry
2019-06-18 19:04:35 -05:00
Ketrai
61ae1c774c Removes edits. 2019-06-08 14:42:27 +02:00
Ketrai
d891fa2836 Adds worms 2019-06-07 19:55:03 +02:00
Mechoid
53b84236cf Merge branch 'master' of https://github.com/PolarisSS13/Polaris into FishingFtWorldServer 2019-05-03 21:44:53 -07:00
Verkister
e49589ec90 Removes melee damage from snacks.
Not gonna ask why it was there but someone nearly lit the place on fire after jokingly mashing their sandwich at a borg downstream lmao.
2019-05-02 18:55:04 +03:00
Heroman3003
839aa5d6b1 Adds some premade full condiment bottles 2019-04-30 10:34:42 +10:00
Atermonera
8d3a72a9a9 Merge pull request #6129 from Heroman3003/mask-helmet-eating
Allows liquidfoods to be eaten through protective gear
2019-04-27 15:53:37 -08:00
Atermonera
a11504f5f2 Merge pull request #6068 from Mechoid/WhatWasWillBe
Re-adds the Space Worm.
2019-04-26 15:32:46 -08:00
Heroman3003
1f24765d1d Allows liquidfoods to be eaten through protective gear 2019-04-22 10:31:07 +10:00
Mechoid
e1876dcd02 Fishing and all its wonders, Ft. World Server code bastardization. 2019-04-17 23:41:03 -07:00
Heroman3003
8b34e47a84 Fixes fortune cookie recipe runtime 2019-04-17 09:26:18 +10:00
Heroman
b85b76eff7 Also makes protein shake and glass in general initialize 2019-04-13 08:30:47 +10:00
Heroman
b8cda8b5fc Changes shakers to use initialize 2019-04-12 17:29:19 +10:00
Mechoid
7f0695496d Re-adds the Space Worm. Splits its icons into its own DMI. 2019-04-11 13:56:02 -07:00
Neerti
374fa5ed13 Merge pull request #6052 from Heroman3003/pizza-time
Initialize conversion for pizza boxes
2019-04-08 18:49:21 -04:00
Heroman3003
51ce7ec511 Replaces pizza box New with Initialize 2019-04-08 09:10:40 +10:00
Heroman
00856f4da5 Fixes to gibber 2019-04-07 13:53:25 +10:00
Unknown
303d815186 More Runtimes 2019-03-29 08:42:28 -04:00
Unknown
f3ab897298 Lynx Fixes Runtimes
Polaris Edition
2019-03-29 08:28:25 -04:00
Neerti
47b76a0232 Merge pull request #5991 from Schnayy/drinkfixandschnapps
Fixes drinks and adds new one.
2019-03-08 20:17:51 -05:00
Schnayy
5e96a1c1be Fixes drinks and adds new one. 2019-03-05 22:46:07 -06:00
Anewbe
aade8c356f Items are now assumed to be conductive, rather than the opposite 2019-03-02 20:34:49 -06:00
elgeonmb
3e9624caa9 Adds the Zaddat Race + Modifies pressure damage calculations (#5869)
* Redoes the suit-wearing bugs, renaming them to the Zaddat.

(If this shows up on the main Polaris repo, I fucked it again, please yell at me until I unfuck it)

* finishes the zaddat species pending someone yelling at me and or me getting more/better sprites

adds three new accessories of dubious stylistic value for the gaudy-ass suit people

* i lied
engineers and other Zaddat who start with a hat will no longer burn in the harsh light of the station.
scarves and other decor items can now be equipped to space suits. cape, half-cape, and sash items now have valid slot flags

* gives zad a larynx

* gives Zaddat assisted languages

* zad sprites now have weird growths

* activate starvation mode

* mask is now red-faced so as not to give the zaddat skin cancer

* adds shrouds and zaddat hypos to cargo. renames zaddat hypos to glucose hypos since like, technically anyone can use them

* aand adds zad hypos to the fitness machines. thanks for letting us not starve, spacer guild

* adds zad hypos to the fitness vendor

* new purple zaddat icons (untested, probably fine)

* appeases anewbe

* something bad has happened

* Updates Zaddat per forum discussion
Flashes now deal significant burn to zaddat, enough to put them in crit with two flashes
Zaddat (and diona and vox) can no longer wear rigs
Shrouds no longer protect against shock damage, but do protect against radiation damage
Prometheans can now wear shrouds
Sprites are much prettier

* adds changelog

* Update zaddat.yml

* appeases anewbe
2019-02-06 23:34:21 -06:00