Commit Graph

117 Commits

Author SHA1 Message Date
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
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 Sieyes
94b621b310 Merge pull request #893 from Cameron653/master
Polaris Feburary Syncs
2017-02-02 23:06:13 -05:00
Arokha Sieyes
380eee789d Merge pull request #899 from VOREStation/suitnerf
Nerf teleport rig
2017-02-02 22:59:29 -05:00
Arokha Sieyes
03b6697d04 Nerf teleport rig
Reduces the armor to less than that of the EMT suit, removes integrated O2 tank.
2017-02-02 18:38:58 -05:00
Screemonster
f8c121cbb9 adds recoloured phazon sprite for the scuttlebug 2017-02-02 13:24:55 +00:00
killer653
277071532b Item path fixes and edits
1. Oxygen tank has been changed from emergency_oxygen to
emergency/oxygen. Fixed this in custom clothings and the map

2. The vending_vr had some redundant things (repeating name, desc,
product ads, icon state, icon deny, contra.) and also the securivendor
code was causing problems since it's now been ported to polaris and is
accessable on all vending machines. Commented out the securivendor
vorestation logging.
2017-02-01 15:25:45 -05:00
Screemonster
f41ff655fc fixes scree's suit modkit 2017-01-31 05:57:50 +00:00
Arokha Sieyes
49d5ce7052 Workaround for custom_item proc
It's incapable of spawning this belt, and apparently if I ready up before round start, it will spawn everyone who readies up in space for some reason? Orbis and I tested and aren't suuuper sure why. It's probably the belt though. So, easy solution is a box.
2017-01-30 16:47:31 -05:00
Arokha Sieyes
0008e89a5a Merge pull request #881 from OrbisAnima/swimsuits2
Swimsuits for All! Fluff items for some
2017-01-30 12:38:52 -05:00
OrbisAnima
65e8ac37ab Fluff Swimsuit minor adjustment
Description of Xsdew item was the wrong one, sorry!
2017-01-29 12:20:44 -03:00
OrbisAnima
5cb92eb078 Swimsuits for all!
-Added swimsuits to be picked in the loadout, without replacing the
uniform (They spawn in a capsule, a limited box that can only hold one
swimsuit, and only a swimsuit, and cannot be turned into cardboard.)

-Added Xsdew departamental selection of Swimsuits (Security, Medbay,
Science and Engineering)

-Added Xsdew Fluff Swimsuit!

Fixes #874
2017-01-29 11:26:32 -03:00
OrbisAnima
16a44b75bd Swimsuits for All! Fluff items for some
-Added swimsuits to be picked in the loadout, since I created a special
container for them, they wont replace the uniform you spawn with. They
can be found in uniforms and suits!

-Added Xsdew departamental selection of swimsuits! (Security, Medbay,
Science and Engineering)

-Added Xsdew Fluff swimsuit!
2017-01-29 11:10:00 -03:00
Dhaeleena
2fef35d980 Lots of changes and Fluff fixes 2017-01-26 11:48:22 -03:00
Arokha Sieyes
3abc27114c Re-fix Verin? 2017-01-24 10:07:45 -05:00
Arokha Sieyes
45710ef8b3 Readds fed coat?? 2017-01-24 10:06:06 -05:00
Arokha Sieyes
0af7ce8b5b Icon, and removes old gun 2017-01-24 09:58:26 -05:00
Arokha Sieyes
860ce47074 All Aronai fluff change stuff except the icon 2017-01-24 09:58:18 -05:00
JoanRisu
8961a73ecb Modern Federation Coats and Officer Caps 2017-01-24 01:13:41 +09:00
Spades
48c95efa2b Merge pull request #849 from VOREStation/lcvend
Life crystal tweaks
2017-01-19 00:36:13 -05:00
Spades
d7c272bfa2 Merge pull request #851 from VOREStation/rigchange
Rig changes
2017-01-19 00:34:06 -05:00
Arokha Sieyes
c299c7ce22 Rig changes
Reduced armor further, removed stealth field. Paramedics probably don't need those.
2017-01-18 20:20:45 -05:00
Arokha Sieyes
d27cef2d5e Life crystal tweaks
Adds to medical vendors (the big ones, not the wall ones), tweaks case name to be more normal. Includes in the examine text of the crystal that you can attach it to jumpsuits to remind people.
2017-01-18 11:38:04 -05:00
Arokha Sieyes
243a732a33 Fixes Verin's trenchcoat
Forgot some lines and it should have been fluff path anyway
2017-01-16 16:12:10 -05:00
Arokha Sieyes
4e1dd1d237 Merge pull request #835 from VOREStation/arosuit
Event medic suit
2017-01-15 17:21:08 -05:00
Arokha Sieyes
7dd40a12be Event medic suit
Basically a medic suit for me for events or gateway missions or whatever. Doesn't spawn.
2017-01-15 17:10:42 -05:00
Arokha Sieyes
7bb0b8fc5f Verin Fluff Coat
Credit to Yosh for coding and providing the .diff for it. I just added a comment and put in the custom_items.txt change.
2017-01-13 19:53:40 -05:00
killer653
3c0b93cbfa Fixes compile error 2016-12-27 09:16:46 -05:00
killer653
ff7786ede3 Fixes an accidental overwrite
Someone accidentally defined a custom cane as the normal cane path
2016-12-27 09:11:04 -05:00
JoanRisu
22b9c5ad15 Fix box 2016-12-13 06:57:36 +09:00
JoanRisu
59fb1f2e7b Did some more custom PDA adjustments and fixed the g44 stuff. 2016-12-12 22:42:40 +09:00
JoanRisu
6347f2edec Adding the G44 and its energy variant. 2016-12-12 20:18:59 +09:00
JoanRisu
0ecd0a51be Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2016-12-12 18:37:33 +09:00
JoanRisu
2ca24521d9 fixing PDAs and adding squirrelkin language. 2016-12-12 18:36:12 +09:00
Cinder
6e72f73f99 Update custom_boxes_vr.dm 2016-12-04 19:25:13 -06:00
Cinder
d39e075610 Update custom_items_vr.dm 2016-11-30 19:05:35 -06:00
Cinder
6fa444c289 Added IvyMooMoo's HoloID / a kit so it spawns
Kit includes:
-Ivy's HoloID
-A Vanilla Cake
-A Box of Cigarettes
-A Box of Matches
-A White Beret
2016-11-30 02:36:13 -06:00
Spades
1c4a0cefc9 Merge pull request #715 from VOREStation/screepr
Fix Scree's fluff item issue
2016-11-09 15:19:56 -05:00
Arokha Sieyes
78014b957c Merge pull request #709 from Cameron653/master
Enables SilencedMP5A5's custom items. Taursuit bugfix.
2016-11-09 12:29:04 -05:00
Arokha Sieyes
8060a265da Fix Scree's fluff item issue
I couldn't update his PR so I did my own. It turns out that the if(..()) thing is how all the other can_mob_equip things handle their calls to ..() so we'll just do that too. Also I named my things backwards, derp.
2016-11-09 12:22:59 -05:00