Commit Graph

17960 Commits

Author SHA1 Message Date
killer653
9e4502a09b Adds numbing fangs as a trait 2017-09-14 15:33:58 -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
Spades
60574b650d Merge pull request #2154 from Cyantime/illegal
Makes the thermal vision NIF software illegal.
2017-09-13 21:22:02 -04:00
Cameron653
b0bbcf83c4 Merge branch 'master' into NUMBING_BITE_V2 2017-09-13 16:16:37 -04:00
Spades
bdf5ce72f8 Merge pull request #2132 from Ketrai/master
adds new event... solargrubs
2017-09-13 16:09:19 -04:00
Spades
4ffab6b629 Merge pull request #2150 from Cameron653/SOULCATCHER_EXAMINE
Allows NIF to show up on examine.
2017-09-13 16:09:12 -04:00
Spades
d517cea2df Merge pull request #2140 from Cameron653/AIRTIGHT_SEC_GOGGLES
Makes sec goggles airtight.
2017-09-13 16:09:03 -04:00
Spades
0f149499a7 Merge pull request #2151 from Cameron653/DHAEL_SQUISH_CODE
Ports insole code from old code.
2017-09-13 16:08:52 -04:00
Spades
81f5f32764 Merge pull request #2158 from Yewmi/horny-demons
Adds new pair of colorable demon horns to species customization
2017-09-13 16:08:33 -04:00
Spades
ce49c5b758 Merge pull request #2152 from Cameron653/LOINCLOTH
Adds a new xeno loincloth
2017-09-13 16:07:46 -04:00
Spades
44e9d90ba4 Merge pull request #2149 from Cameron653/RAHBOOPRED_SPRITES
Rahboopred sprites
2017-09-13 16:07:25 -04:00
Spades
a5b7908c5d Merge pull request #2097 from kcin2001/Harpy
New Species: Harpy
2017-09-13 16:05:38 -04:00
Yumi (AKA Gowst)
40ab778185 Adds outward-facing demon horns 2017-09-12 23:24:50 -05:00
Cameron653
e39e0d352c Merge pull request #2136 from chaoko99/OHGODHIDEYOURHUSBANDS
Prometheans can now underwear.
2017-09-12 12:20:36 -04:00
Unknown
1bd3fcb3dc Prometheans can now wear underwear. 2017-09-12 09:06:03 -07:00
Cyantime
fdab0d8394 Makes the thermal vision NIF software illegal. 2017-09-12 11:12:44 -04:00
killer653
47afd1502d Adds a loincloth to the xeno loadout 2017-09-11 21:18:29 -04:00
Ketrai
2a5605555b adds 2 more dishes 2017-09-11 19:18:11 +02:00
Ketrai
ab5aee8473 adds 2 more dishes 2017-09-11 19:18:09 +02:00
killer653
a722e20926 Removes macros 2017-09-11 11:14:29 -04:00
killer653
b8dc1460fc Adds insole code from old code. 2017-09-11 09:22:49 -04:00
Cameron653
7315a63f2e Decreases the character count from 100 -> 60 2017-09-11 08:10:16 -04:00
killer653
a7f473f5b2 Adds NIF to examination 2017-09-11 07:07:55 -04:00
Cameron653
ce1a10eea1 Update Chemistry-Reagents-Medicine_vr.dm 2017-09-10 22:38:36 -04:00
Cameron653
92e5a19603 Update Chemistry-Reagents-Medicine_vr.dm 2017-09-10 22:37:54 -04:00
Cameron653
4befc0dede ))))))))))))))))))))))))))))))))))))))))))))))) 2017-09-10 22:13:34 -04:00
Cameron653
b0049c7f0c Adds OD effects 2017-09-10 22:07:29 -04:00
Cameron653
830e1bb8c5 Update robolimbs_vr.dm 2017-09-10 20:07:26 -04:00
killer653
6297180aa5 Adds rahboopred sprites 2017-09-10 19:51:41 -04:00
Cameron653
ea41766ca9 Merge branch 'master' into NUMBING_BITE_V2 2017-09-10 19:23:52 -04:00
killer653
db3a941652 Adds numbing bite 2017-09-10 19:21:21 -04:00
Spades
c7124d458a Merge pull request #2129 from Cameron653/SHARP_MELEE_FIX
Sharp melee fix
2017-09-10 19:12:30 -04:00
Ketrai
4f2c98df32 adds grubevent 2017-09-10 19:55:32 +02:00
Ketrai
b25b7127de adds grubevent 2017-09-10 19:54:25 +02:00
Cyantime
5fd1cdc99b Fixes cyborg typing indicator. 2017-09-10 03:46:27 -04:00
killer653
a20f03037e Makes security tactical goggles airtight. 2017-09-09 23:44:27 -04:00
Ketrai
95b14ab8f2 adds the solargrub mob
yawn
2017-09-09 22:24:11 +02:00
Ketrai
4fce93036c adds grubrecipes 2017-09-09 22:21:50 +02:00
Ketrai
f02b45888b grubstuff 2017-09-09 22:19:21 +02:00
Ketrai
9104810b21 adds grubdrink etc 2017-09-09 22:16:59 +02:00
Ketrai
c32c88ba3e adds grubfoods 2017-09-09 22:13:46 +02:00
Ketrai
131975c281 adds grubchem 2017-09-09 22:12:31 +02:00
killer653
944c6e7f57 Forgot to put a () 2017-09-09 12:49:17 -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
Spades
1f3a61f38f Merge pull request #2116 from Verkister/tough_fluff
Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items)
2017-09-09 12:27:38 -04:00
Spades
6eb472f31d Revert "Adds a new event - Solargrubs!" 2017-09-09 12:24:37 -04:00