Commit Graph
453 Commits
Author SHA1 Message Date
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
Arokha SieyesandGitHub 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 SieyesandGitHub 860049ec30 Merge pull request #1110 from Poojawa/ds9-uniforms
DS9 overcoat hotfix
2017-03-06 02:29:03 -05:00
Arokha SieyesandGitHub 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 SieyesandGitHub 0e01492467 Merge pull request #1107 from VOREStation/aro-hudbetter
Improve AR glasses
2017-03-06 00:43:06 -05:00
Arokha SieyesandGitHub 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
PoojawaandGitHub 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 SieyesandGitHub 5085ed4941 Merge pull request #1095 from Wickedtemp/Wickedtemp-patch-1
Fluff item change for Tempest
2017-03-04 19:49:46 -05:00
Arokha SieyesandGitHub b3cebd2b02 Update custom_clothes_vr.dm
Muh escaped quotes.
2017-03-04 19:45:36 -05:00
WickedtempandGitHub 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
Arokha SieyesandGitHub 809110eda1 Merge pull request #1065 from JoanRisu/Fluff_Items_worshop
Fluff items worshop.....15???
2017-03-03 14:26:43 -05:00
JoanRisu 3785bd3700 ~Changes flag for squirrelkin language
~changes Joan's bag and its icon
+Adds Dhael's gun and permit to her spawnlist
~debug attempt on Crescent Rose's sprite changing code. Also changes sprites.
2017-03-03 03:39:00 -08:00
Screemonster 89a0559077 Add's vinjj's fancy bandana 2017-03-03 11:33:02 +00:00
Poojawa 7891bf2b52 Trek Uniforms 2017-03-03 02:51:05 -06:00
JoanRisu ceca64804d Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-02 23:28:45 -08:00
JoanRisu 3f26a1d223 Some personal changes to my items and adds a dune buggy for science expeditions. 2017-03-02 23:17:04 -08:00
PoojawaandGitHub 1375db16bc fixes typos 2017-03-02 15:06:48 -06:00
Poojawa c062a0cfe1 trek uniforms + loadout listing 2017-03-02 12:00:19 -06:00
Dhaeleena 7712aabda9 Permit for cat gun 2017-03-01 19:58:33 -03:00
Screemonster b1908e65db fun meme, but OP now invisible things actually work 2017-02-28 08:57:22 +00:00
Screemonster ef7e20c16a Adds nerdglasses 2017-02-27 01:51:19 +00:00
Arokha Sieyes 69097464ee Fix Tempest's Saddlebags, redo how Saddlebags Work
In the title!
2017-02-23 19:20:51 -05:00
Screemonster 5e47eaf7fe fixes battlerifle and unsc shotgun worn sprites 2017-02-22 21:28:04 +00:00
Arokha SieyesandGitHub 5b72365c48 Merge pull request #1006 from VOREStation/fluffstuff
More fluff changes
2017-02-22 10:31:57 -05:00
Arokha Sieyes deeee616d1 More fluff changes
Some day I'll decide exactly what I want. That day probably isn't today, either.
2017-02-22 10:20:07 -05:00
killer653 63ae45159d Tempest item, saddle adjustments 2017-02-21 20:55:09 -05:00
Leshana d4771b3544 Fix number of wire spools in vulpine belt and add to custom_items.txt 2017-02-19 18:40:29 -05:00
Arokha Sieyes 1efad3d5b9 More guns + permit renewal
Adds 2.5 new guns (one isn't finished yet, it's got weird code so it's going to take a bit). They 'eat' the ammo they're loaded with and destroy the casings. So, if anyone wants caseless ammo, look at how I did it here.

Also renews my permit. Haven't done it IC yet, but I'll just delete it and the gun until I have. (Gosh if you can trust me to not just spawn random guns for myself you can trust me to do that :V)
2017-02-15 20:17:15 -05:00
Screemonster a7ae4fd4ab bugfix in anti-tamper proc 2017-02-13 01:42:33 +00:00
killer653 b055158c0a Gives the hypospray a name 2017-02-07 18:01:06 -05:00
killer653 43a11821c5 Adds Tempest's syringe correctly
Fixes #897 correctly
2017-02-07 17:26:41 -05:00
Arokha Sieyes a37e7067d1 Renames fluff vials
People were getting a little scared at "Aronai begins loading vial (poisoned) into the hypospray" when it was antitoxin. x3
2017-02-04 23:49:10 -05:00
Arokha SieyesandGitHub 94b621b310 Merge pull request #893 from Cameron653/master
Polaris Feburary Syncs
2017-02-02 23:06:13 -05:00
Arokha SieyesandGitHub 380eee789d Merge pull request #899 from VOREStation/suitnerf
Nerf teleport rig
2017-02-02 22:59:29 -05:00