Commit Graph

1615 Commits

Author SHA1 Message Date
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
Unknown 7eeb7c0ce1 Changes adminordrazine pill shape/metabolism 2019-05-02 19:39:23 -04:00
Unknown 822a9c7259 Buffs adminordrazine 2019-05-02 17:36:29 -04:00
Mechoid 1f9fe948c4 Sterilizine Hurts Slimes 2019-04-18 18:51:23 -07:00
Atermonera 2af21a1911 Merge pull request #6096 from Heroman3003/syringe-beaker-interactions
Changes way syringes interact with containers
2019-04-18 09:26:34 -08:00
Mechoid e1876dcd02 Fishing and all its wonders, Ft. World Server code bastardization. 2019-04-17 23:41:03 -07:00
Heroman 2cb39322d1 Changes way syringes interact with containers 2019-04-16 17:10:56 +10:00
Mechoid 4b4035932f Modifier integration. 2019-04-14 13:38:10 -07:00
Mechoid e668b12bc5 Liver and Kidney filtration 2019-04-14 11:56:20 -07:00
Mechoid 8fa53f6611 Starts work on Pulse-based Reagent Processing. 2019-04-13 23:52:33 -07:00
Mechoid 3808093471 Fix forgotten stuff. 2019-03-31 17:35:55 -07:00
mistyLuminescence effe543406 Unidentified Auto Tweak 2: Electric Boogaloo (#5990)
* Remakes #5983 by request.
2019-03-31 16:19:06 -07:00
Schnayy 5e96a1c1be Fixes drinks and adds new one. 2019-03-05 22:46:07 -06:00
Mechoid f50ae5b633 Tweaktweak 2019-02-10 18:14:04 -08:00
Mechoid 9a845219bf Tweak Daxons 2019-02-09 20:52:33 -08: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
Neerti 9175f5801d Fixes compile error.
I put the CLAMP()s to it.
2019-02-01 15:29:00 -05: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
Neerti b1860f9baa Merge pull request #5829 from kevinz000/tg_vv
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-01-15 22:18:50 -05:00
Mechoid 0db38cb75b Wooooooork 2019-01-14 21:34:35 -08:00
kevinz000 61561ade31 Clamp replace 2019-01-12 05:51:08 -08:00
Neerti 3880d13e10 Merge pull request #5815 from Heroman3003/eggnog
Adds eggnog drink to the game.
2019-01-12 04:29:04 -05:00
Heroman3003 8b6a62a496 Adds eggnog. 2019-01-08 12:31:42 +10:00
Spades e37f25546a Fixes a typo that broke the saketini recipe (#5807)
Ported from https://github.com/VOREStation/VOREStation/pull/4534
2019-01-05 23:46:05 -08:00
Neerti 68d3406898 Merge pull request #5773 from Neerti/identification_system
Adds Identification System, New Autoinjectors
2018-12-14 21:06:06 -06:00