Commit Graph

1536 Commits

Author SHA1 Message Date
Anewbe
532012c5bf Merge pull request #5520 from Mechoid/No_Freezing_Beer
Iced beer no longer drops you to 3 degrees centigrade.
2018-08-26 12:48:43 -05:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Mechoid
5ec1fea6b8 Iced beer no longer freezes you to 3 degrees C, which is enough to seriously burn a Skrell. Seriously, that's weird. 2018-08-25 14:06:19 -07:00
Atermonera
5819840d8b Merge pull request #5495 from Anewbe/drinking_problem
Drinking more booze gets you drunk faster
2018-08-15 21:12:20 -07:00
Atermonera
a2e5894655 Merge pull request #5490 from Anewbe/drug_effects_redux
The speed-related chem effects are no longer a one-or-none affair, oxy causes slowdown
2018-08-15 21:04:50 -07:00
Anewbe
c9e64af771 Drinking more booze gets you drunk faster 2018-08-11 18:46:15 -05:00
Anewbe
02084177fb The speed-related chem effects are no longer a one-or-none affair, oxy causes slowdown 2018-08-06 12:16:40 -05:00
Anewbe
f1507ebfa2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-04 11:20:02 -05:00
Neerti
6ffd299fd7 Merge pull request #5461 from Atermonera/supply_nanoUI
Refactors supply controller
2018-08-04 02:55:15 -04:00
Anewbe
7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
atermonera
ef6c5abf15 Refactors supply controller.
Supply consoles now run nanoUI
2018-07-31 19:11:02 -07:00
Anewbe
8f54bb1248 Speeds up alcohol 2018-07-27 17:17:07 -05:00
avabee
b4e1d3f6fb Fixes a typo with cups of lime tea.
It would erroneously say "berry tea". This fixes that.
2018-07-05 17:27:27 -05:00
Arokha Sieyes
a150728e08 Fix hypospray exploit 2018-07-03 18:05:41 -04: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
MagmaRam
9c5492fd00 glass of cup of coffee begone 2018-06-12 21:51:10 -05:00
Anewbe
05fa92c489 Wires are under catwalks, fueltanks are over floor decals 2018-06-09 13:26:30 -05:00
Anewbe
7e44e95d24 Corrects some plane and layer issues 2018-05-20 18:41:21 -05:00
Arokha Sieyes
91f0c05a4b SSAO object excludes
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:38:22 -04:00
Atermonera
2748ceb170 Merge pull request #5243 from Anewbe/sleeping_pills
Soporific and Chloral work when ingested again
2018-05-05 12:09:37 -07:00
Anewbe
70b23e905e Merge pull request #5209 from VOREStation/pol-medsound
Ports the medical item sounds from Bay
2018-05-02 22:11:03 -05:00
Anewbe
2b9fb9398a Soporific and Chloral work when ingested again 2018-05-02 17:35:26 -05:00
Anewbe
1e052007e0 Chemicals should process again 2018-05-02 13:09:29 -05:00
Atermonera
40ba73a7a4 Merge pull request #5231 from VOREStation/pol-vs-3604
Allow cancelling in chem master modals for pills
2018-05-01 12:39:42 -07:00
Mechoid
1db4c4b677 ~Promethean Tweaks: The one with the chemicals, and the other thing. (#5201)
* Promethean Tweaks Round Howevermany We're On Now

* Tweak again. Drinks only plink damage that can be regenned. Multiple drinks, or other sources of tox will still mean these are dangerous.

* Add Blurb other than just "What has science done?"

* Adds the changelog.

* Fixes the stupid.

* Fixfix @ Ater
2018-05-01 12:23:47 -07:00
Arokha Sieyes
f0be908e39 Allow cancelling in chem master modals for pills
Suggested in https://github.com/VOREStation/VOREStation/issues/3604, this adds cancel buttons when creating pills so you can abort the process rather than getting forced to create pills you might have just accidentally clicked the button for and then breaking them back into beakers.

Resolves https://github.com/VOREStation/VOREStation/issues/3604 (Just in case GitHub knows how to cross-repo close issues)
2018-04-30 11:42:09 -04:00
Arokha Sieyes
ab1351f00d Ports the medical item sounds from Bay
A port of https://github.com/Baystation12/Baystation12/pull/21268, which adds sounds to the healing item stacks, taperolls, and hyposprays
2018-04-25 14:39:49 -04:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072)
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
2018-03-28 12:59:12 -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
Arokha Sieyes
9f4a14b171 POLARIS: Weird snacks runtime 2018-03-25 17:09:33 -04:00
Neerti
e91bb8f3b6 Merge pull request #5071 from Cameron653/patch-1
Makes coffee milkshakes STOP KILLING PEOPLE
2018-03-22 22:31:13 -04: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
Neerti
70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204
[PORT] Revamp logging for consistency
2018-03-20 21:13:47 -04: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
Cameron653
36097cb31d Changes 2018-03-17 00:52:07 -04:00
Cameron653
981b768320 Makes a failsafe drink overdose proc 2018-03-16 13:35:20 -04:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Arokha Sieyes
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04:00
Mechoid
06eb3e5e47 Merge pull request #5018 from Anewbe/syringe
Syringe adjustments
2018-03-10 13:28:00 -08:00
Anewbe
f2da429eab Merge pull request #4980 from MisterLayne/ED_CLN
Adds the ED-CLN
2018-03-10 15:04:07 -06:00
Anewbe
7ed36f51f2 Syringe adjustments 2018-03-07 18:46:50 -06:00
MisterLayne
21c9cd0a05 fixes code, and adds changelog (hope I did it right) 2018-03-06 20:52:55 -05:00
Anewbe
2d452be603 Ingested reagents act half as quickly, rather than half as well 2018-03-05 19:40:29 -06:00
Anewbe
4efc7e7efe Merge pull request #4979 from Belsima/cube
Discourages eating monkey cubes
2018-03-01 10:32:57 -06:00
Belsima
d8b0685d25 Discourages eating monkey cubes 2018-02-27 18:19:05 -05:00
Atermonera
519754c2e8 Merge pull request #4959 from Screemonster/itsmostlywater
Makes drinking bleach bad for you
2018-02-26 12:16:13 -08:00
Screemonster
b8b173b044 Makes drinking bleach bad for you 2018-02-25 18:51:18 +00:00
Anewbe
387f977f45 Copy paste is bad, kids 2018-02-25 02:44:32 -06:00
Schnayy
8ccf0f7532 AlliCo Hallmark Goods (#4887)
* Adds the gift vendor, AlliCo Hallmark Goods, ran the name by Elgeon beforehand. Is a delightfully gaudy vending machine placed in the locker rooms. The coffee machine was removed and the sweatmax moved to take it's place so the gift vendor is next to the laptop and cigarette vendors. Prices were based off of the SweatMax vendor.

Before: https://i.gyazo.com/0d6758fc8a469fea6e340b5937b95f82.png
After: https://i.gyazo.com/ab21b6ff7ed012786d475b71f1ec180e.png

Vendor will normally dispense:
- Heart box chocolates
- Bouquets
- Cheaper fake bouquets
- Each of the 4 cards previously added.
- All the therapy dolls.

Will dispense the following with a coin:
- All small plushies
- Newly added trinket box.

Will dispense the following when hacked:
- Gilthari Luxury Champagne
- Plans to add a handbuzzer in the future but not right now.

Items & Reagents added:

- Champagne. Is not a mixable reagent, listed as a child of wine.
- Gilthari Luxury Champagne. Contains said reagent.
- Trinket box. Think an engagement ring box, except it can also hold coins and medals. May be toggled open/closed, when opened it's description will say what's inside. Can only hold one item. Thanks to Mechoid for helping me code this mess. https://i.gyazo.com/7a16faada015ef0795a4db2ec6429e68.png
- Also goes in and fixes a small bug with the heart box saying it contains donuts when it does, in fact, not contain donuts.

Side note, mapping things in is scary!!!

* In the process of fixing the map merger nonsense w/ mechoid's help.

* We're almost there lads.

* If this doesn't work I'll cry.

* Changes name to AlliCo Baubles and Confectioneries, fixes conflict (hopefully), and adds friendship bracelets to vendor.

* REVERTING ITEMS.DMI. Attempting to fix conflict.

* Recommitting items.dmi

* One last attempt to fix the conflict before I make some bigger changes to get this through.

* Removed conflicting file and committed out calls on the sprite. Will readd in separate PR.

* now with 20% less silly
2018-02-24 11:01:23 -06:00