Commit Graph

16690 Commits

Author SHA1 Message Date
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
166e888397 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:16:10 -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
Neerti
b706595d57 Makes red alert and evacs silence the atc
Comments out military ships because lore for them is not finalized.
2017-03-13 07:41:10 -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
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
0248ba0861 Don't allow ventcrawling if vents are welded
What's the point of welding vents, again?
2017-03-13 02:01:29 -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
0bb3a71625 Merge pull request #1169 from VOREStation/aro-newpolsync
Polaris Sync
2017-03-13 01:50:11 -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
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
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
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
Anewbe
6a26b48469 Merge pull request #3067 from VOREStation/batt
Give internal cell its own icon
2017-03-11 21:27:20 -06: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
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
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
Arokha Sieyes
279232997d Fix flour!!! 2017-03-11 01:14:15 -05:00
Leshana
889e9403f0 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-11 01:07:22 -05:00
Anewbe
f4dd443b01 Ports the translator 2017-03-10 21:46:57 -06:00
Leshana
baf8e2d143 Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed.
We define the inventory screen objects for hands to be special in that apply overlays to themselves for handcuffed.  By putting that logic on the screen object itself, we allow it to be expanded to other cases besides handcuffs in the future without conflict.
2017-03-10 22:06:05 -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
Anewbe
ac79f548e7 Sorta implements armor soak, very WIP 2017-03-10 20:26:37 -06:00
Arokha Sieyes
a2d89ae1b8 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-10 20:04:43 -05:00
Arokha Sieyes
1783dc282b Math is hard okay 2017-03-10 18:45:31 -05:00
Arokha Sieyes
4f47ce2d77 "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-10 18:25:48 -05: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
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