Commit Graph

1640 Commits

Author SHA1 Message Date
Atermonera
22e28f29fe Merge pull request #6804 from Cerebulon/bigsounds
Big Bastard Incidental Sound Port
2020-03-15 11:38:44 -07:00
Cerebulon
2670a1c0e4 Adds more machine button sounds (#6802)
* Adds more machine button sounds

* chang
2020-03-11 17:30:42 -07:00
Atermonera
dcc4d199cc Merge pull request #6803 from Schnayy/CookingUpdate1
Cooking adjustments
2020-03-10 15:40:04 -07:00
Cerebulon
52e6669bf9 Big Bastard Incidental Sound Port 2020-03-08 23:25:45 +00:00
Schnayy
4b2a0cc6cf Many small changes. 2020-03-08 10:16:17 -05:00
Cerebulon
7656625987 Fixed menthol cigarette runtime 2020-03-08 15:16:00 +00:00
listerla
02f97a116e Adds ecigs and vaping (#6753)
* Adds ecigs and vaping

* Uncomments ssobj

Co-authored-by: lemon <lemon@localhost.localdomain>
2020-03-06 07:09:24 -08:00
Atermonera
acaa4d4f8d Merge pull request #6717 from LeighKnapenberger/master
Fixes Mint Apple Sparkle having a recipe, but no drink
2020-02-24 12:59:59 -08:00
Anon
689f238a80 Merge remote-tracking branch 'origin/master' 2020-02-20 19:09:04 -05:00
Cerebulon
f801cc95be Allows precision placement of most items 2020-02-19 21:16:26 +00:00
Arokha Sieyes
5b15917d32 to_chat replacing stream operator 2020-02-17 13:14:08 -05:00
LeighKnapenberger
d53490639d Fixes Mint Apple Sparkle having a recipe, but no drink 2020-02-10 22:54:16 -05:00
Atermonera
0dbcdf6e55 Merge pull request #6628 from Ketrai/cakebranch
Adds a mega cooking recipe
2020-01-20 20:14:07 -08:00
Atermonera
50d9274819 Merge pull request #6622 from Mechoid/WaterResistanceExists
Water resistance exists
2020-01-20 19:51:35 -08:00
Atermonera
5d5e361649 Merge pull request #6621 from Shadow-Quill/Desc-Adds
Moar descriptions for things
2020-01-20 19:48:57 -08:00
Ketrai
6db1d29836 Ports deathbell because the recipe requires it. 2020-01-18 12:43:29 +01:00
Mechoid
9699844fc7 Preliminary 2020-01-12 15:29:53 -08:00
Shadow
6088899908 Round One 2020-01-11 02:25:38 -06:00
Shadow
e018d59641 Ding! 2020-01-10 23:04:54 -06:00
Ketrai
d434a9d12b adds gnomes. (#6595)
* adds gnomes

* Makes the house nice and bright.

* copypasta error

* Odd

* makes gnomes adminspawn only.

Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com>
2020-01-08 10:46:42 -08:00
Mechoid
d9076dbaff Xenoflora expansion take2 (#6592)
Xenoflora
2020-01-08 10:44:41 -08:00
TheFurryFeline
8ab73354ee Printable Spray Bottles
So, seems that there's been issues of running out of spray bottles sometimes. So here we are, printable in the autolathe for 300-375 glass/steel each.

Changelog Note:

- Allows printing of a spray bottle in the Autolathe.
2019-12-23 23:54:32 -05: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
Novacat
45aa4ba3de More bug fixes (#6560)
* More esword fixes

- Fixes Holodeck eswords being completely broken, Holodeck eswords are not recolorable
- Fixes Toy sword onmob sprite not properly updating
- Fixes eswords not properly updating onmob color (this is an incredibly hacky fix)
- Readds the esword sub types, they are not recolorable

* Removes unintended code

* More unintended code removal

* Fixes spy bug sprite

* Fixes PMC-S Name

* Fixes syringes not working through voidsuits.
2019-12-13 17:55:47 -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
Meghan Rossi
673fdb25aa Stop protein's affect_ingest calling nutriment's affect_ingest twice
Only actually affected Unathi.  They will get slightly less nutrition from protein due to this being fixed.
2019-11-07 13:31:04 +00:00
Mechoid
73795f40cd Xenowork Prep For Future (#6491)
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
2019-11-04 17:37:17 -09: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
Unknown
7f4b35580d Blind port of Bay Radiation Subsystem
Figured I would do my part to move everything over to subsystems. Not tested yet.
2019-09-30 23:59:31 -04: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
8ae2cae804 Fixfix some last minute things. 2019-08-07 21:40:05 -07: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
Nalarac
88e79b30c5 Adds NOCONDUCT to Some Items 2019-08-07 09:46:39 -05:00
Andrew
1496ce2e65 Adds Laser Tag Turrets Plus Changes (#6324)
* Adds Laser Tag Turrets

* Adds changelog

* Reverts Lethal Turrets Shooting to Kill

* Small No Longer Means Misc Life

* Revert "Merge branch 'master' into Turret"

This reverts commit 0300e6723b, reversing
changes made to 219348783d.

* Revert "Revert "Merge branch 'master' into Turret""

This reverts commit ca3d13b337.

* Github why

* Change laser.dm to master?

* Revert "Change laser.dm to master?"

This reverts commit da562f6bc1.
2019-07-27 11:45:17 -08:00
Andrew
ea918bbf20 Allows Longer Visible Text on Beakers
Changed it from showing at most 10 characters to 20
2019-07-20 18:22:59 -05:00
Cerebulon
521e06d3f9 Salt is Salt 2019-07-13 07:16:47 +01:00
Wickedtemp
3306fdf8a5 Update cartridge.dm 2019-07-09 20:56:25 -05: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
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
Novacat
5b18382ca6 Grey scale pills and colored pillbottles (#6199)
* Grey scale pills and colored pillbottles

Baystation ports of PR #19714 and PR #21578

Known issue: The Chem master's pill selection does not properly show the grey scale pills, unfortunately. There is a 'close enough' approximation, however.

* Minor oversights

* Another oversight

* Programming language confusion

* Corrects some code
2019-06-16 20:28:02 -05:00
Ketrai
d891fa2836 Adds worms 2019-06-07 19:55:03 +02:00
Atermonera
a033ac4779 Merge pull request #6113 from Mechoid/FishingFtWorldServer
Fishing!
2019-05-06 10:15:23 -08:00
Neerti
083c4f599f Merge pull request #6149 from Novacat/nova-holowarrant
Buffs adminordrazine
2019-05-05 20:06:47 -04:00
Mechoid
53b84236cf Merge branch 'master' of https://github.com/PolarisSS13/Polaris into FishingFtWorldServer 2019-05-03 21:44:53 -07:00
Unknown
9ce4361faa Ports #6039 with Virgo Fixes 2019-05-03 20:36:06 -04:00