Commit Graph

25868 Commits

Author SHA1 Message Date
Arokha Sieyes
01edd04bc5 Add several new foods
Sushi, Lasagne, Wings, Doner Kebab, Reishi's Cup, Hot&Sour Soup, General Tso's, Kitsune Udon, Goulash, Roast Beef

Also made it so synths don't have reduced taste. You can just RP it however you want, I'd rather let them see the info about flavor and if you want to RP that you have low quality taste 'sensors' then so be it.
2017-03-13 00:36:34 -04:00
Arokha Sieyes
91ec566408 The ultimate in food vending
Since some foods were removed.
2017-03-11 19:28:14 -05:00
Arokha Sieyes
55b2bd3b95 I guess these foods are gone or moved. 2017-03-11 19:00:43 -05:00
Arokha Sieyes
4c0e330140 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync 2017-03-11 18:47:17 -05:00
Anewbe
17cedd22a6 Merge pull request #3071 from Yoshax/goodfood
Slightly improves upon food creation
2017-03-11 11:05:27 -06:00
Arokha Sieyes
55f17ded47 Merge pull request #1158 from JoanRisu/Fluff_Items_worshop
Fluff items workshop
2017-03-11 01:22:25 -05:00
Arokha Sieyes
2777ce58c8 Merge pull request #1159 from Yoshax/moarmining
Belt mining slight expansion
2017-03-11 01:22:06 -05:00
Anewbe
e4fe4256b7 Merge pull request #3066 from Neerti/3/9/2017_wet_skrell_are_liars
Skrell/Tesh Examination Change
2017-03-10 20:53:53 -06:00
Yoshax
056d31a4cd Fixes a warning 2017-03-11 02:40:29 +00:00
Yoshax
d98fcfcc14 Adds pike, weak pike and strong carp, also adds them to the belt mining lists 2017-03-11 02:40:18 +00:00
JoanRisu
388bf0a537 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-10 15:13:01 -08:00
Arokha Sieyes
cb02263050 Merge pull request #1157 from Cameron653/master
Adds Vorrarkul's chococoat
2017-03-10 18:07:44 -05:00
Arokha Sieyes
a25539122a Merge pull request #1156 from Screemonster/patchingbulkheads
makes broken doors patchable
2017-03-10 18:07:36 -05:00
Arokha Sieyes
37fbc39ce6 Merge pull request #1146 from Screemonster/particlescience
adds particle guns to science and cargo
2017-03-10 18:07:29 -05:00
Arokha Sieyes
0bbc12893c Merge pull request #1154 from VOREStation/aro-translator
Translator Improvement
2017-03-10 18:05:27 -05:00
Cameron653
7cc2010e49 Fixes a mistake 2017-03-10 17:25:35 -05:00
JoanRisu
337eb55cc4 Adds missilerack and open rover icons in. 2017-03-10 14:22:40 -08:00
killer653
a115d8dc2b Adds Vorrarkul's chococoat
Resolves #1102
2017-03-10 17:20:50 -05:00
Screemonster
aace86cbc4 returning an actual value might help 2017-03-10 21:57:39 +00:00
Screemonster
c9032e1539 makes broken doors patchable 2017-03-10 21:44:28 +00:00
Yoshax
3a31c88f43 Fixes sliceable food and slices 2017-03-10 19:49:15 +00:00
Yoshax
6f12826c45 Adds ability to add food to the chem master because the condimaster is beyond broken 2017-03-10 17:00:31 +00:00
Yoshax
26d56e2cf4 Fixes/adds reagent transferring to/from food 2017-03-10 16:39:57 +00:00
Arokha Sieyes
4902e94c0b Merge pull request #1145 from JoanRisu/Fluff_Items_worshop
Conflict Resolver: Revenge of the Merge
2017-03-10 09:49:31 -05:00
JoanRisu
11b8810c34 Minor edit to correct plague doctor mask for octavious 2017-03-10 00:21:50 -08:00
Mechoid
467cea8a00 Multi-sprite Panel updoot. 2017-03-09 22:54:44 -08:00
Arokha Sieyes
25d6a3effb Translator Improvement
Lets you pick a language to translate INTO from your known languages. If you then hand it off to someone who doesn't speak that, they won't be able to read the text on the screen. They can just reboot it and pick their own language.

Mostly for fluff, for people who would rather see things translated into their more-well-known language that they speak better.
2017-03-10 00:40:31 -05:00
Arokha Sieyes
ac97cbf081 Merge pull request #1150 from VOREStation/vplk-atmos-leak
New Event: Atmos Leak
2017-03-09 23:27:19 -05:00
Arokha Sieyes
8df5e0437f Merge pull request #1149 from VOREStation/vplk-canister-leak
New Event: Canister Leak
2017-03-09 23:27:08 -05:00
Arokha Sieyes
08b5d3a7b3 Merge pull request #1152 from VOREStation/aro-implanter
Replace backup implant boxes with special implanter
2017-03-09 23:26:54 -05:00
Arokha Sieyes
d2466be11c Merge pull request #1148 from VOREStation/aro-translator
Handheld Translator
2017-03-09 23:19:24 -05:00
Arokha Sieyes
57f475392e Replace backup implant boxes with special implanter
Stores 4 inside the implanter, so medical people can just carry one with them if they want. Added more to the vendors to offset the smaller number per thing (7 per box vs 4 per implanter). The sprite is unique, and represents how many are left on the outside. Orange means just one left, flashing red means empty.

You can take the implants out if you want, swap them between implanters, etc. This one is self-cleaning, and can't cause infections, yay. So if you have to leave one in the lobby for people, now you don't have to feel bad about horrible cross-contamination?
2017-03-09 23:13:52 -05:00
Leshana
a50d3c1a88 New Event: Atmos Leak
In this event some sort of gas leak occours! A random area on the station is chosen to experience a leak of a randomly chosen gas!
* By default, areas with any people in them are protected, so it won't just kill someone.
* A warning announcement is given shortly before, so there is some warning.
* Dorms, Shuttles, Holodeck and Supermatter are protected.
* At higher severity, adds worse gasses and possibility of high/low temperature.
2017-03-09 22:04:43 -05:00
Arokha Sieyes
cbf32f5482 Special backup implanter
Holds four, takes up less space in a bag if people want to walk around with it.
2017-03-09 22:00:05 -05:00
Leshana
672360c48b New Event: Canister Leak
Somewhere on the station, a gas canister is faulty and ruptures, releasing its contents (no explosion).
* Added as an event_manger event.  This version is nice on low severity and picks a canister with nobody nearby.
* Also added as a gamemaster event.
* Added helper method to check area occupancy.
2017-03-09 19:59:32 -05:00
Arokha Sieyes
0fd54d1449 Handheld Translator
Turn it on, keep it in hand or pocket, and it'll translate languages for you (not signlanguage...).
It doesn't bother displaying languages that you speak. I assume your character doesn't look down at the screen if they understood what was said (it's mostly just to prevent spam when only 1 in 4 people standing around talking is speaking another language).

There's one on a desk in the security locker room and one in the medical breakroom. I figure these two departments have the highest need of translations. R&D can make more. The design is fairly cheap.
2017-03-09 18:00:26 -05:00
Arokha Sieyes
ee7a9b9955 Adds better backup implant sprite
Vox cortical stack!
2017-03-09 16:40:28 -05:00
Screemonster
87f940293a adds particle guns to science and cargo 2017-03-09 18:10:26 +00:00
JoanRisu
2192a3b022 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-09 01:17:56 -08:00
JoanRisu
c1d35bc97d Step one we need to talk, you say conflicting files kinda suck. 2017-03-09 01:13:49 -08:00
JoanRisu
37e6655ae7 Revert "Attempted fix on Tasald's clothes."
This reverts commit ab0ee8a37e.
2017-03-09 01:09:47 -08:00
JoanRisu
ab0ee8a37e Attempted fix on Tasald's clothes. 2017-03-09 00:51:50 -08:00
Neerti
9167156db5 Skrell/Tesh Examination Change
Examining a Skrell/Teshari while not a member of the same species will obscure the Skrell/Teshari's gender, to better reflect lore.
Ghosts, and silicons (AIs/borgs) are exempt from this.
2017-03-09 02:44:23 -05:00
Arokha Sieyes
d2fc25a382 Merge branch 'master' of https://github.com/VOREStation/VOREStation 2017-03-09 00:57:05 -05:00
Arokha Sieyes
e8d8c9b72b *screams internally* 2017-03-09 00:55:37 -05:00
Arokha Sieyes
782a8630fa Merge pull request #1141 from VOREStation/enable-events
Enable VOREStation custom event rotation setup.
2017-03-09 00:40:47 -05:00
Arokha Sieyes
a9db9fa4e2 More bug fixes for bug fixes 2017-03-09 00:21:44 -05:00
Arokha Sieyes
9780ccba31 Fix two minor bugs
Wrong access on an airlock, and translocator televore when used to eat people yourself.
2017-03-08 22:34:33 -05:00
Leshana
602c0dc4e6 Enable VOREStation custom event rotation setup.
* Adds a new file which overrides the Polaris event rotation with our own datums.
* Disables a bunch of events so we can turn on auto-starting of the remaining ones.
2017-03-08 21:48:34 -05:00
Arokha Sieyes
adb28b055a Merge pull request #1139 from VOREStation/aro-flip
Now in disease form
2017-03-08 21:13:36 -05:00