Commit Graph

24761 Commits

Author SHA1 Message Date
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Neerti
e08b8edbd3 Merge pull request #3077 from Anewbe/translator
Ports the translator
2017-03-14 21:23:13 -04:00
Neerti
c91c8dc177 Makes the mention system more robust on name detection.
Changes * to + for bolding.
2017-03-14 15:45:55 -04:00
Anewbe
aa79162b97 Merge pull request #3085 from VOREStation/fixfood
Fixes 7 Recipes I Broke
2017-03-13 21:09:00 -05:00
Arokha Sieyes
c3d0f7e2dd 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:36:13 -04:00
Anewbe
ab1812d9ff Adds the ear translator 2017-03-13 20:03:45 -05:00
Anewbe
5481e90cbe Merge pull request #3074 from VOREStation/recipes
"Recipe Dump" admin verb
2017-03-13 17:17:54 -05:00
Anewbe
6a15a9419a Merge pull request #3081 from VOREStation/advmed
Fix internal bleeding on adv med scanners
2017-03-13 16:41:12 -05:00
Anewbe
f2db035a46 Merge pull request #3083 from VOREStation/bread
Find/replace job for bread slices
2017-03-13 16:27:32 -05:00
Anewbe
ae599bb68d Merge pull request #3065 from Neerti/3/6/2017_invisible_spaceships
Ports Vore's Space Traffic Controller feature.
2017-03-13 15:59:09 -05: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
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
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
c7c9b5e7e4 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:48:38 -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
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
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
279232997d Fix flour!!! 2017-03-11 01:14:15 -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
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
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
Mechoid
467cea8a00 Multi-sprite Panel updoot. 2017-03-09 22:54:44 -08:00
Leshana
532864cab0 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 20:05:25 -05:00
Arokha Sieyes
9373c0d00d Give internal cell it's own icon
Was a little weird to reuse the supercell... there are already WAY TOO MANY "not an actual powercell" powercells. So this one is just repainted blue and joins all the other prosthetic organs in surgery.dmi. The icon line can just be removed because the parent points to this file.
2017-03-09 16:30:57 -05: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
Neerti
9dbd05e8d4 Ports Vore's Space Traffic Controller feature.
Ports Vore's fluff spaceships that talk on comms every ~40 minutes.
2017-03-08 22:06:48 -05:00
Anewbe
7130d56b80 Merge pull request #3064 from Woodratt/WR_SC_Changes
WR_SC_Map_Changes
2017-03-08 19:58:46 -06:00
woodratt
19fb047f01 WR_SC_Map_Changes
- Fixes sprite issues with departmental intercoms.
- Tweaks to the random objects dm
- Copies Bay's flora and warning sign list, as well as ports some of their signs.
- Addition of a couple new floor decals.
- New table preset, wooden reinforced.
2017-03-08 17:44:48 -08:00
Anewbe
0465613465 Changes tank sprite for Vox 2017-03-08 12:36:43 -06:00
Anewbe
59a75f37a2 Merge pull request #3026 from Yoshax/ghoststuff
Cleans up, fixes, and improves ghost teleporting
2017-03-08 10:58:36 -06:00
Anewbe
9141314d60 Merge pull request #3060 from nachomeep/sounds
Enables photocopier sounds
2017-03-08 10:53:09 -06:00
Anewbe
96d94410df Merge pull request #3048 from nachomeep/gas
Makes phoron very purple.
2017-03-08 10:52:53 -06:00
nachomeep
a53b196e13 missed a line 2017-03-08 08:05:41 -05:00
Anewbe
50b508f2d6 Adds Morpheus skull head 2017-03-07 22:34:42 -06:00
nachomeep
59a592fd34 minor delay adjustment 2017-03-07 16:13:19 -05:00
nachomeep
eaba140555 adds delay to sounds 2017-03-07 16:11:38 -05:00
nachomeep
72d54925d5 enables photocopier sounds 2017-03-07 15:16:57 -05:00