Commit Graph

25830 Commits

Author SHA1 Message Date
killer653
a115d8dc2b Adds Vorrarkul's chococoat
Resolves #1102
2017-03-10 17:20:50 -05: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
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
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
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
Arokha Sieyes
ef69742a1c REALLY right-side talk icons
I see the 'just talked' one flips back over.
2017-03-08 19:59:29 -05:00
Arokha Sieyes
ca2ef4c3fe Now in disease form
A disease that makes you flip!
2017-03-08 19:52:55 -05:00
Arokha Sieyes
fa59590019 Merge pull request #1135 from VOREStation/aro-adminbus
WIP Event ship and smaller shuttle
2017-03-08 18:28:55 -05:00
Arokha Sieyes
e52a5afa60 Merge pull request #1136 from VOREStation/aro-translocator
Personal Translocator
2017-03-08 18:28:48 -05:00
Arokha Sieyes
4712a9c49a Merge pull request #1137 from VOREStation/aro-pets
Fix befriending pets
2017-03-08 18:28:38 -05:00
Arokha Sieyes
0b8460f159 Merge pull request #1126 from Yoshax/tails
Adds vulpankin tail to tail selection and updates taj and munathi to atch species files
2017-03-08 18:04:40 -05:00
Arokha Sieyes
bc3e4291c3 Fix befriending pets
Fixes Runtime and Renault's expected job titles for being befriended.
2017-03-08 18:03:04 -05:00
Arokha Sieyes
97fcdd5cd7 Personal Translocator
Adds it to science. Has a high materials and research cost, and is considered ***contraband***, as it says in the description.

Also included in this PR is device_alt.dmi, a bunch of alternate device sprites which can be fun for stuff.
2017-03-08 18:01:35 -05:00
Arokha Sieyes
80e513657c WIP Event ship and smaller shuttle
WIP on Virgo-2.dmm, Joan must help finish it :O
2017-03-08 17:57:29 -05:00
Leshana
b0a6dfd58a Supply Demand event cleanup
* Improved the ending messages to be more fluffy and descriptive.
* Scaling bonus cargo points if win.
* Bugfixes for ending conditions and removing extra debugging systems.
* Move comments because indentation awk script gets confused.
2017-03-08 13:34:11 -05:00
Yoshax
5a6c020b16 Adds vulpankin tail to tail selection and updates taj and unathi to match species files 2017-03-08 02:41:46 +00:00
Leshana
b289360eb7 Upgrade Supply Demand event to take department activity into account. 2017-03-07 18:40:45 -05:00
Leshana
fbe46b7df4 Added Supply Demand Event
* Yes, its an event where CentCom asks you to actually do something useful and make stuff.  You put it on the shuttle to win.
* It has something for most departments.  So far there are seven categories of items it requests:
 * Researched items (From protolathe etc)
 * Food Items
 * Chemistry Reagents
 * Drinks
 * Metals
 * Gas Mixtures
 * Mecha
2017-03-07 18:40:45 -05:00
Arokha Sieyes
01a2ae7850 Merge pull request #1121 from VOREStation/sync-2017-03-06
Polaris Sync
2017-03-07 03:40:27 -05:00
Arokha Sieyes
8006edee57 Merge pull request #1122 from VOREStation/aro-talkswap
Swap typing indicator to right side
2017-03-07 01:50:20 -05:00
Arokha Sieyes
8f0d7656e8 Merge pull request #1120 from VOREStation/aro-telenoms
Nerf Vore
2017-03-07 00:54:39 -05:00
Arokha Sieyes
05f7002950 Swap typing indicator to right side
With the common availability of AR glasses, this is super annoying to have it always under the job ID.
2017-03-07 00:53:21 -05:00
Leshana
12ab0e4da2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 2017-03-06 22:46:28 -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
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
Leshana
17c74c17fc Updated our custom items and maps to account for the path changes for boots! 2017-03-06 21:46:35 -05:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -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
Arokha Sieyes
e1f5010820 Nerf Vore
Gosh. So robust.

Actually fixes vore so that it doesn't teleport people into your stomach even if they move away. When did that become a thing?
2017-03-06 16:00:38 -05:00