Commit Graph

1073 Commits

Author SHA1 Message Date
Screemonster
4ec6342e6a adds serkii's dress and a meson engineering HUD 2017-03-16 07:58:07 +00:00
Kelshark
65bd173433 Fixed mauser boots problem and pathing 2017-03-12 18:38:01 -04:00
Kelshark
d76c99bb70 sync dme errors and fluff items pathing fix with boots 2017-03-12 00:07:11 -05: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
Kelshark
986f16b3a2 Map fixes from merge 2017-03-10 22:15:01 -05:00
Yoshax
056d31a4cd Fixes a warning 2017-03-11 02:40:29 +00:00
Kelshark
e08d945c06 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-03-10 20:34:32 -05:00
Kelshark
25d81c8acf Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/admin/verbs/buildmode.dm
#	code/modules/multiz/movement.dm
#	code/modules/multiz/structures.dm
#	code/modules/multiz/turf.dm
#	config/custom_items.txt
#	vorestation.dme
2017-03-10 20:34:12 -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
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
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
25d6a3effb Translator Improvement
Lets you pick a language to translate INTO from your known languages. If you then hand it off to someone who doesn't speak that, they won't be able to read the text on the screen. They can just reboot it and pick their own language.

Mostly for fluff, for people who would rather see things translated into their more-well-known language that they speak better.
2017-03-10 00:40:31 -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
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
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
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
izac112
b2c04ab80b Merge branch 'Master' of https://github.com/izac112/YawnWiderStation into Master 2017-03-07 18:06:09 +01:00
izac112
cadb711670 Tiny fix 2017-03-07 18:03:59 +01:00
Arokha Sieyes
648aab61b9 Merge pull request #1114 from VOREStation/aro-hudbetter
Remove an errant button, fix fluff glasses
2017-03-06 03:10:33 -05:00
Arokha Sieyes
0ac9497102 Remove an errant button, fix fluff glasses
Another fluff glasses fix after Kisuke's and Tempest's. Somehow forgot my own, and didn't fix Kisuke's all the way. On-mob sprite was normal glasses.
2017-03-06 02:50:50 -05:00
Arokha Sieyes
860049ec30 Merge pull request #1110 from Poojawa/ds9-uniforms
DS9 overcoat hotfix
2017-03-06 02:29:03 -05:00
Arokha Sieyes
7b6be61523 Merge pull request #1109 from VOREStation/aro-hudbetter
Fixes two fluff glasses
2017-03-06 02:09:36 -05:00
Poojawa
b4f168bafc how the blood heck did this dropped? 2017-03-06 00:26:27 -06:00
Arokha Sieyes
2e4bbe7e5d Fixes two fluff glasses
Koos and Temp
2017-03-06 01:22:10 -05:00
Arokha Sieyes
0e01492467 Merge pull request #1107 from VOREStation/aro-hudbetter
Improve AR glasses
2017-03-06 00:43:06 -05:00
Arokha Sieyes
8fe74341d9 Merge pull request #1106 from JoanRisu/Fluff_Items_worshop
64x32. Oh dear, that is rather long.
2017-03-06 00:40:49 -05:00
Arokha Sieyes
ce01659ae1 Adds a console to medical, engineering, security AR glasses
Crew monitor, alerts console, other alerts console
2017-03-06 00:33:08 -05:00
Arokha Sieyes
c7857a5bf3 Improves AR glasses, makes them available
Now you can start with them in loadout. They are no longer SUNglasses though, so they won't protect you from flashes.

There are several models, the loadout ones are the civilian ones.

- Civilian: Displays job ID icon based on the person's ID, and shows a health bar only if they are injured.
- Medical: Same as civlian, but displays advanced status (virus, borer, etc) along with backup implant status, and allows medical records access.
- Security: Same as civilian, but displays warrant and arrest status, and will automatically darken (electrochromic) in response to flashes, making the wearer immune, plus security records access.
- Engineering: Same as civilian, but will automatically darken to protect one's eyes during welding.
- Research: Same as civilian, but has a trendy goggle form factor for SCIENCE reasons.
- Omni: Has the combined features of all of the above. The only pair available spawns in the CD's office. (CC officers also)
2017-03-05 20:58:59 -05:00
JoanRisu
997623c2da Adds some 64x32 two-handed gun sprites to the code. 2017-03-05 15:43:41 -08:00
Poojawa
bb6a4fb0ab missed a comma 2017-03-05 04:20:57 -06:00
Poojawa
ec3056466c Merge remote-tracking branch 'refs/remotes/VOREStation/master' into ds9-uniforms 2017-03-05 03:53:57 -06:00
Poojawa
5fdbaceb44 ds9 overcoats 2017-03-05 03:53:55 -06:00
Arokha Sieyes
ffac4f72ba KIN -> KHI Renames
They don't have a Navy, I dunno why I put that. Also checks the file that SOMEONE keeps forgetting to check.
2017-03-04 22:14:45 -05:00
Arokha Sieyes
5085ed4941 Merge pull request #1095 from Wickedtemp/Wickedtemp-patch-1
Fluff item change for Tempest
2017-03-04 19:49:46 -05:00
Arokha Sieyes
b3cebd2b02 Update custom_clothes_vr.dm
Muh escaped quotes.
2017-03-04 19:45:36 -05:00
Wickedtemp
2566cfe8b6 Fluff item change for Tempest
It changes the examine text and the item name for Tempest's Medical Hud, from 'Purple MedHUD' to 'Tempest's MedHUD'.
2017-03-04 18:35:18 -06:00
Arokha Sieyes
4f06a18057 Dragor fluff items, Aronai fluff item fixes
Also fixes *flip to not print an error message (emotes must have messages that they display) and redoes how vials start with reagents to make it easier to code them. Also swapping genders as a promethean won't randomize your hair anymore. That was silly, and relevant to Dragor's thing.
2017-03-04 16:04:43 -05:00
Kelshark
081e280e27 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme
2017-03-03 19:17:04 -05:00
Kelshark
fd626b4d70 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-03-03 19:10:18 -05:00
Arokha Sieyes
809110eda1 Merge pull request #1065 from JoanRisu/Fluff_Items_worshop
Fluff items worshop.....15???
2017-03-03 14:26:43 -05:00