Commit Graph

25918 Commits

Author SHA1 Message Date
Leshana
42ed71ec2e In fact lets make most of the events one-shot! Otherwise it gets repeatative. 2017-03-17 01:03:34 -04:00
Leshana
f2033dda13 Adjustments to Supply Demand event.
* Adjusted to scale better with difficulty and be not quite so extreme.   Most categories will now be:
  * Mundane:  1-2 items
  * Moderate: 2-4 items
  * Major: 3-6 items
* Clarified that not everything has to go in crates.
* Vary flavor text for different severities.
2017-03-16 18:25:01 -04:00
Leshana
393fa31b4a Add leak events and djust weighting of Supply Demand.
* Supply demand was firing waaay too often.  Changed it to be a one shot event at each level, so it will at most happen three times per shift.
* Added atmos leak and canister leak events to rotation.
2017-03-16 17:21:02 -04:00
Arokha Sieyes
465446be25 Merge pull request #1187 from VOREStation/apc-map
Enhances power monitor computers to use the nano-map to show APC locations.
2017-03-15 22:55:10 -04:00
Leshana
a30406c2ee Add nanomap to the Atmos Control Computer
* In addition to showing a list of air alarms, the atmos computer now shows them as pins on the nanomap.
* Since the atmos computer shows all z-levels, the nanomap will be mutli-z.  Limited to station levels of course.
2017-03-14 22:44:12 -04:00
Arokha Sieyes
6dc1698752 Fixes 7 Recipes I Broke
LOOK NOBODY'S PERFECT OKAY

I added /food/ to the path of all the food recipes but these 7 have a completely silly means of actually creating the food items, and it results in that proc never being called because I didn't change THOSE to have /food/ in the path as well.

It's not like dough is important, okay.

And this mechanism of doing this is dumb.

And huff.

~~pleasedonthurtme~~
2017-03-13 21:35:22 -04:00
Leshana
356e96b421 Enhances power monitor computers to use the nano-map to show APC locations.
* In addition to showing APCs on a sensor'd powernet, the same APCs can be shown on the nano-ui map!
* Hover tooltip shows basic information on the APCs.
* Makes it easier to spacially understand where APCs are when you send people out to work on them.
2017-03-13 20:50:30 -04:00
Arokha Sieyes
78f5111051 Fix flour!!! 2017-03-13 18:01:29 -04:00
Arokha Sieyes
fd58913efa Now it does drinks and not-quite-foods too
I had to subtype all the recipes though. This should probably have been done a while ago anyway, medicine and drinks should probably have some sort of path separation like this.
2017-03-13 18:01:19 -04:00
Arokha Sieyes
bbd5603905 Math is hard okay 2017-03-13 18:01:11 -04:00
Arokha Sieyes
9bdd3495af "Recipe Dump" admin verb
The idea of updating the wiki list of recipes is daunting, especially getting all the icons and resizing them to look nice on a webpage, so fuuuuuuuuck that.

I made a verb that does it. It dumps upsized (64x64) images of every food icon and a recipes.html file into your cache with a table that contains all the recipes, nicely formatted, in alphabetical order (the -burger and -kebab at the top are because those are [whatever-meat]-burger and [whatever-meat]-kebab).

Then you can just throw them on a website. It will include a recipes.css file if it's in the same dir.
Here's the result on our server:
https://vore-station.net/infodump/recipes.html
2017-03-13 18:01:03 -04:00
Arokha Sieyes
966930e70d Merge pull request #1177 from VOREStation/newlangs
Angel and Demon languages
2017-03-13 17:50:26 -04:00
Arokha Sieyes
d16198915a Merge pull request #1179 from VOREStation/aro-foodtweaks
Changes a couple new recipes
2017-03-13 17:50:16 -04:00
Arokha Sieyes
3e0ad19ff4 Merge pull request #1178 from VOREStation/aro-breadfix
Fix bread slices
2017-03-13 17:50:09 -04:00
Arokha Sieyes
e97cc01485 Changes a couple new recipes
Uses cutlet instead of just raw meat now that I know it exists
2017-03-13 14:59:33 -04:00
Arokha Sieyes
e2c4064f49 VR-specific fixes for this 2017-03-13 14:15:04 -04:00
Arokha Sieyes
8f9bb4cdc3 Find/replace job for bread slices
`/obj/item/weapon/reagent_containers/food/snacks/breadslice` is not a real thing. The only reason the code compiled with references to it is because there was a line at the top of sandwich.dm that defined the attackby proc for it, which willed it into existence with all the default 'snack' values so it was just called 'snack', had no icon, etc.

`/obj/item/weapon/reagent_containers/food/snacks/slice/bread` is the real path for bread slices, and this replaces all mentions of one with the other.
2017-03-13 14:14:49 -04:00
Arokha Sieyes
9a8b0911c6 Angel and Demon languages
Not actually MAGICAL angels and demons, I believe, just they resemble them and are spacefaring races and so sometimes end up matching various religious texts in terms of appearance and habit.

Can we please stop adding whitelisted languages? It's dumb. We have ONE person whitelisted for gutter, and a lot of good it does them since nobody else has even applied. They'd have to talk to someone with a translator.
2017-03-13 12:45:03 -04:00
Arokha Sieyes
c0e0874ee3 Fixes species with very low health in growpod
Like teshari. It's only a problem when upgraded.
2017-03-13 11:47:14 -04:00
Arokha Sieyes
b8d0b2a5bd Merge pull request #1174 from VOREStation/aro-voretaste
Add vore taste system
2017-03-13 03:57:15 -04:00
Arokha Sieyes
08fc5f81d6 Merge pull request #1173 from VOREStation/aro-syntfabupgr
Makes synthfab upgrades do something
2017-03-13 03:44:38 -04:00
Arokha Sieyes
ccdccbe35c Make OOC escape more robust 2017-03-13 03:42:22 -04:00
Arokha Sieyes
ff33ec4765 Add vore taste system
There's a setting on bellies (off by default except for the first belly you're ever given which is on by default) as to whether or not they can 'taste' prey. If so, and the prey has set their (literal) flavor text in their vore prefs (button at the bottom) you will be shown their taste when ingested into that belly.

There's also a "Lick Someone" verb in IC that allows you to lick adjacent mobs to see what they taste like.

Both system account for reagents splashed on the mob, so if you want to apply soy sauce to the akula before you eat them, you should be able to taste that as well. Just keep in mind those splashed reagents do dry up eventually, so don't take too long to eat them after that if you actually want to taste it.
2017-03-13 03:42:08 -04:00
Arokha Sieyes
e0bafbd878 Whups. 2017-03-13 03:09:51 -04:00
Arokha Sieyes
03d6dea950 Merge pull request #1172 from VOREStation/aro-ventweldcrawl
Don't allow ventcrawling if vents are welded
2017-03-13 02:25:22 -04:00
Arokha Sieyes
3315fcf1e2 Makes synthfab upgrades do something
Matter bins increase storage amount, manipulators decrease brute amount, scanner decreases burn amount. All upgraded to max will do no damage and store 90,000 materials (30,000 default).

For #1117
2017-03-13 02:25:03 -04:00
Arokha Sieyes
b82c5a8ca4 Don't allow ventcrawling if vents are welded
What's the point of welding vents, again?
2017-03-13 02:00:40 -04:00
Arokha Sieyes
65cb118f93 Merge pull request #1170 from VOREStation/aro-advmedbleed
Fix internal bleeding on adv med scanners
2017-03-13 01:53:14 -04:00
Arokha Sieyes
0bb3a71625 Merge pull request #1169 from VOREStation/aro-newpolsync
Polaris Sync
2017-03-13 01:50:11 -04:00
Arokha Sieyes
7123396663 Fix internal bleeding on adv med scanners
The nanoui template expects "internalBleeding" to be in the organStatus list, not in the organData list. I agree with this expectation, as this is also where normal "bleeding" is stored, so I updated the adv_med.dm file rather than changing the template.
2017-03-13 01:43:38 -04:00
Arokha Sieyes
6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29:01 -04:00
Arokha Sieyes
c6e8ab9e1b Merge pull request #1167 from VOREStation/aro-nfoods
Add several new foods
2017-03-13 01:21:10 -04:00
Arokha Sieyes
e4a99ccae4 Update my favorite vendor while I'm at it. 2017-03-13 01:03:25 -04:00
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
Anewbe
e526a4cdc7 Merge pull request #3062 from Anewbe/skull_head
Adds Morpheus skull head
2017-03-12 20:05:23 -05:00
Anewbe
a1b90a0411 Merge pull request #3080 from Neerti/3/10/2017_i_hate_byond_regex
Adds Two QOL Say/Emote Features
2017-03-12 19:48:18 -05:00
Anewbe
cb85943043 Merge pull request #3068 from Leshana/vplk-canister-leak
New Event: Canister Leak
2017-03-12 19:38:59 -05:00
Anewbe
e2680eff87 Merge pull request #3063 from Anewbe/tank_fix
Changes tank sprite for Vox
2017-03-12 19:26:07 -05:00
Anewbe
ecc5b13908 Merge pull request #3076 from Leshana/handcuffs-hud
Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed.
2017-03-12 19:24:56 -05:00
Neerti
11b1185005 Adds Two QOL Say/Emote Features 2017-03-12 09:30:48 -04:00
Arokha Sieyes
9feec8e4ed Merge pull request #1164 from VOREStation/aro-posisurg
Allow MMI/Posi/Digi brains w/o minds to be put in bodies
2017-03-12 01:30:02 -05:00
Arokha Sieyes
67bc8132a3 Allow MMI/Posi/Digi brains w/o minds to be put in
Right now if you try to put an empty posibrain into a mob it won't let you. But with resleeving, this might be just the step before putting a mind in them, so that's sort of not how it should work. When it was just a ghost-trap object that ghosts could get into, maybe, but it's moved beyond that.
2017-03-12 01:15:40 -05:00
Arokha Sieyes
a0c4b05ec3 Some map tweaks
Mostly area placement tweaks in the bar so it's not "two" areas, renamed the "longue" to be spelled right, fixed a christmas tree, fixed a disposals pipe.
2017-03-12 00:12:32 -05:00
Anewbe
6a26b48469 Merge pull request #3067 from VOREStation/batt
Give internal cell its own icon
2017-03-11 21:27:20 -06:00
Arokha Sieyes
91ec566408 The ultimate in food vending
Since some foods were removed.
2017-03-11 19:28:14 -05:00
Leshana
d8099edc4c Make sure that the canisters selected have a bit o' air in them. 2017-03-11 19:02:24 -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
Yoshax
14a667abec Adds more types of tea 2017-03-11 22:01:19 +00:00
Anewbe
17cedd22a6 Merge pull request #3071 from Yoshax/goodfood
Slightly improves upon food creation
2017-03-11 11:05:27 -06:00