Commit Graph

33200 Commits

Author SHA1 Message Date
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
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
Anewbe
e507c9bc40 Merge pull request #3079 from Yoshax/drinks
Adds more types of tea
2017-03-11 20:13:56 -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
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
Anewbe
ade632ce6f Merge pull request #3069 from Mechoid/A-Tale-Of-Borgs-And-Panels
Borg Custom-sprite Fix: Panels
2017-03-10 20:08:25 -06: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
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
nachomeep
ad094bf64d Now orange with purple stripes. 2017-03-08 08:04:25 -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
Neerti
04e38f8e26 Merge pull request #3059 from Anewbe/custom_item_check
Adds a check for custom items
2017-03-06 22:43:49 -05:00
Anewbe
9ed301feaa Merge pull request #3058 from Leshana/boots-fix
Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
2017-03-06 21:33:44 -06:00
Anewbe
44cd464941 Adds a check for custom items 2017-03-06 21:25:54 -06:00
Leshana
a5a805414b Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not.  The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05:00
Neerti
9b13c7367c Merge pull request #3057 from Anewbe/tails
Edits Taj and Unathi tail sprites
2017-03-06 19:02:58 -05:00
Neerti
fc75357c61 Merge pull request #3054 from Anewbe/healthscanner
Oxyloss shows as cyan
2017-03-06 18:59:27 -05:00
nachomeep
afcd662beb turns all phoron purple 2017-03-06 17:54:40 -05:00
Anewbe
132d9a7611 Edits Taj and Unathi tail sprites 2017-03-06 14:41:06 -06:00
Anewbe
079a5e787e Merge pull request #3056 from Leshana/supply-shuttle-hook
Adds Supply Shuttle Hook
2017-03-06 13:55:25 -06:00
Anewbe
13d161565e Merge pull request #3055 from VOREStation/missinghud
Add TOTAL_HUDS define
2017-03-06 13:51:01 -06:00
Leshana
8355428e4e Adds Supply Shuttle Hook
* Adds a global hook for when the supply shuttle reaches centcom.  The existing sell_crate hook is too limited, as it only detects what is in crates, and is fired many times, making it hard to produce a summary for events that might want stuff shipped on the shuttle.
2017-03-06 12:36:19 -05:00
Arokha Sieyes
e65ef1b0d6 Add TOTAL_HUDS define
Making a list just... 'be 10 long' is bad. Like update_icons layers and various other things, if you add more, it will compile fine and then you get runtimes later, which is a little annoying. Having places you just have to 'know' to update elsewhere in the code is meh.
2017-03-06 01:07:46 -05:00
Yoshax
45af122441 forcemove 2017-03-05 23:58:17 +00:00
Anewbe
b4ec8eb026 Oxyloss shows as cyan 2017-03-05 14:19:51 -06:00
Anewbe
d68292b236 Merge pull request #3002 from Anewbe/plant_things
Space Vines are more dangerous
2017-03-05 14:15:13 -06:00
Anewbe
05e6ef5ad8 Merge pull request #2988 from Anewbe/boots
Boots are now a subtype of shoes
2017-03-05 14:13:47 -06:00