Commit Graph

323 Commits

Author SHA1 Message Date
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
Cameron653
266e300d27 Merge pull request #2306 from saysage/master
Hotfix for custom clothes
2017-10-16 16:47:50 -04:00
saysage
934288aa9e Update custom_clothes_vr.dm 2017-10-16 16:02:35 +03:00
Spades
d2ffc7c4f1 Merge pull request #2297 from saysage/master
JackNoir413 custom clothes
2017-10-15 16:22:58 -04:00
Screemonster
fc103186cb removes a scree fluff item 2017-10-15 10:08:27 +01:00
saysage
adc0ea7dd2 Update custom_boxes_vr.dm 2017-10-14 21:40:33 +03:00
saysage
ff314b6213 Update custom_boxes_vr.dm 2017-10-14 21:38:47 +03:00
saysage
7a2386dac0 Update custom_clothes_vr.dm 2017-10-14 21:30:57 +03:00
Natje0
c634235064 Costum_clothes code for Awens clothes. 2017-10-12 03:37:52 +02:00
Cameron Lennox
e650c62c6b LOTS OF FIXES 2017-10-08 18:05:27 -04:00
Spades
f95fa03410 Merge pull request #2243 from JoanRisu/Fluff_Items_worshop
Formatting changes for spawn list
2017-10-02 04:21:30 -04:00
Spades
5df330c17f Merge pull request #2244 from VOREStation/permit
Ace's gun permit
2017-10-02 04:20:41 -04:00
Spades
7fc1a59ff0 no underscores you ding dong 2017-10-02 04:20:28 -04:00
Spades
1a14b8ada7 Ace's gun permit
- Readded Ace's gun permit.
- Rearranged the permits to be in alphabetical order while I was at it.
2017-10-02 03:03:35 -04:00
JOAN-RIG\Joan Risu
91eda4a26c Formatting changes 2017-10-01 20:11:31 -07:00
Cyantime
ad4f15e216 It's not a spawn class idiot 2017-10-01 14:47:47 -04:00
Cyantime
4046b90854 Limits bluespace harpoon teleportation range. 2017-10-01 14:38:44 -04:00
JOAN-RIG\Joan Risu
b55d19c74d Added Drake's uniform to the custom items list 2017-09-29 23:24:32 -07:00
Cameron653
c46c397280 Fixes Beyondmylife's coat 2017-09-29 20:52:08 -04:00
Spades
7991dfcc47 Merge pull request #2215 from Cameron653/RIDING_CROP
Adds riding crop
2017-09-29 18:14:24 -04:00
Spades
57398cdaf1 Merge pull request #2218 from Pawoverlord/pawoverlord_fluffitem
Update custom_permits_vr.dm
2017-09-29 18:12:42 -04:00
Pawoverlord
45389c5ea5 Update custom_permits_vr.dm
Added Sorrel Cavalet to the list of permits.
2017-09-28 19:43:09 -04:00
killer653
3f882d6702 Adds riding crop 2017-09-27 23:27:17 -04:00
Spades
b23ceee403 Merge pull request #2212 from Yewmi/eldi-fluff
Adds Eldi's fluff reagent implant
2017-09-27 20:23:57 -04:00
killer653
8e0f08d43b Forgot this 2017-09-26 18:18:33 -04:00
killer653
833fe7a75f BeyondMyLife: Ne'tra Ky'ram fluff
https://forum.vore-station.net/viewtopic.php?f=26&t=1117&sid=1451fde8eebda775f37a397f5cd50e79

https://forum.vore-station.net/viewtopic.php?f=26&t=1116&sid=1451fde8eebda775f37a397f5cd50e79

https://forum.vore-station.net/viewtopic.php?f=26&t=1115&sid=1451fde8eebda775f37a397f5cd50e79
2017-09-26 18:14:40 -04:00
Cameron653
abb4a58ee1 Update custom_clothes_vr.dm 2017-09-24 13:45:04 -04:00
Spades
d2b8db26c1 Merge pull request #2148 from Cameron653/NUMBING_BITE_V2
Numbing bite v2
2017-09-21 19:47:17 -04:00
Spades
07762f31e7 Some disorganizes changes by Aces
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
2017-09-21 03:22:20 -04:00
Yumi (AKA Gowst)
3af8baf91e Adds Eldi's fluff reagent implant:
https://forum.vore-station.net/viewtopic.php?f=26&t=1102&sid=b2164d1e7fe062182d4849528f6f28b8
2017-09-18 17:37:47 -05:00
stobarico
5ef1f50163 Fixes last line
Duplicate, forgot to take that off after editing the code
2017-09-18 18:32:15 -03:00
stobarico
67b3660521 De-spawns sparks
yis
2017-09-18 16:42:59 -03:00
Stobarico
a7e3032091 Adds sparks (and cooldown)
FINALLY
2017-09-18 00:58:09 -03:00
Stobarico
e1b4e0dff8 Alexis's ancient wand
The approved application: https://forum.vore-station.net/viewtopic.php?f=26&t=1108 (It also has the images, sound and code)
2017-09-17 20:04:48 -03:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
killer653
e40116374b Merge remote-tracking branch 'refs/remotes/VOREStation/master' into NUMBING_BITE_V2 2017-09-14 15:31:17 -04:00
Verkister
6708e45792 cleaning my hands off the lack of fluff directory mess 2017-09-14 13:32:12 +03:00
Verkister
2c2133c098 A miniscule fluff item fix too small to deserve a PR but gets one anyway
-Makes the recent purely cosmetic fluff goggles able to be worn additionally on the extra ear slot and thus not be completely hidden by the character's hairstyles in the "up" state.
2017-09-14 12:14:30 +03:00
Cameron653
b0bbcf83c4 Merge branch 'master' into NUMBING_BITE_V2 2017-09-13 16:16:37 -04:00
killer653
47afd1502d Adds a loincloth to the xeno loadout 2017-09-11 21:18:29 -04:00
killer653
db3a941652 Adds numbing bite 2017-09-10 19:21:21 -04:00
killer653
c5f4074ce4 Merge remote-tracking branch 'refs/remotes/VOREStation/master' into SHARP_MELEE_FIX 2017-09-09 12:39:59 -04:00
killer653
d435213617 Fixes sharp melee 2017-09-09 12:34:28 -04:00
Spades
cd57e49350 Merge pull request #2123 from Cameron653/MP5A5_FLUFF
Updates SilencedMP5A5's fluff gun.
2017-09-09 12:29:18 -04:00
killer653
d644581ae9 Fixes gun mag preload 2017-09-08 07:04:46 -04:00
killer653
03d845d98f whitespace begone 2017-09-08 07:03:32 -04:00
killer653
0b95ed02e7 Updates serdy's gun 2017-09-08 07:02:10 -04:00
Verkister
3bd672954d Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items)
-Adds the approved fluff goggles https://forum.vore-station.net/viewtopic.php?f=26&t=1073
-Also adds general use metal necklace thingy and a colorable headband for loadout selection.
2017-09-06 15:55:16 +03:00
Spades
a55d4c5e4c Imperial Military Update
Adds Imperial stuff for our space elf romans.
2017-09-02 04:07:25 -04:00
Spades
327a9c7f76 Update custom_permits_vr.dm 2017-09-01 06:50:03 -04:00