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
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
Poojawa
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
RadiantFlash7
576dcfb07a
Map work&compiling fix
...
Mad work 2.0, +fixed compile issue with Icon_state in custom clothes.dmi
2017-02-28 23:51:21 -05:00
Screemonster
b1908e65db
fun meme, but OP now invisible things actually work
2017-02-28 08:57:22 +00:00
izac112
20a87dfbd2
Path cleanup and some sprite and fluff updates
2017-02-27 20:19:42 +01: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 Sieyes
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
Kelshark
051b505e3c
Merge branch 'master' of https://github.com/Repede/YawnWiderStation
2017-02-19 12:12:17 -05:00
izac112
a408f5bc49
more flooooof and flooof update
2017-02-19 18:06:32 +01:00
Kelshark
8df7fcd10a
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# .gitignore
# vorestation.dme
2017-02-18 09:40:18 -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
Kelshark
5b6c8aeab6
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/clothing/under/miscellaneous_vr.dm
# code/modules/mob/living/carbon/human/human_movement.dm
# config/custom_items.txt
2017-02-12 00:32:26 -05: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
Kelshark
9ce88c8c6c
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/carbon/human/species/station/seromi.dm
# code/modules/mob/living/silicon/robot/robot_modules.dm
# config/custom_items.txt
# icons/obj/gun.dmi
# maps/virgo-1.dmm
# vorestation.dme
2017-02-03 21:35:22 -05:00
