Commit Graph

8083 Commits

Author SHA1 Message Date
Spades
d2b8db26c1 Merge pull request #2148 from Cameron653/NUMBING_BITE_V2
Numbing bite v2
2017-09-21 19:47:17 -04:00
killer653
81f2b21ecf Merge remote-tracking branch 'PolarisSS13/master' 2017-09-15 21:35:02 -04:00
Neerti
55162bb099 Fixes Borg Lighting Conflicts
Borg lights should be functional again.
Being on fire now makes you glow orange instead of white.  Intensity scales based on fire stacks.
2017-09-15 21:21:27 -04:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
killer653
37dbb666ab Adds a slowdown.
Definitely noticable, not deliberating.
2017-09-14 15:57:32 -04:00
killer653
e0eed41f83 Why didn't this save AHHH 2017-09-14 15:34:22 -04:00
killer653
9e4502a09b Adds numbing fangs as a trait 2017-09-14 15:33:58 -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
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
a5b7908c5d Merge pull request #2097 from kcin2001/Harpy
New Species: Harpy
2017-09-13 16:05:38 -04: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
Mechoid
cd1c8f00ef Fixes Prometheans being unable to select secondary languages. 2017-09-11 20:09:40 -07:00
Anewbe
d9b8e1dc0d Merge pull request #3799 from ghost/genderlessblobs
Adds a non-gendered biological option for prometheans.
2017-09-11 17:26:25 -04:00
Anewbe
21469325ac Merge pull request #3784 from ghost/woodcut
Adds sounds for chopping wood.
2017-09-11 14:11:46 -04:00
killer653
b8dc1460fc Adds insole code from old code. 2017-09-11 09:22:49 -04:00
killer653
a7f473f5b2 Adds NIF to examination 2017-09-11 07:07:55 -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
Anewbe
42e8bb6284 Merge pull request #3767 from Neerti/8/10/2017_make_xenobio_old_again
Make Xenobiology Old(ish) Again
2017-09-10 17:12:38 -04:00
Cyantime
5fd1cdc99b Fixes cyborg typing indicator. 2017-09-10 03:46:27 -04:00
Ketrai
95b14ab8f2 adds the solargrub mob
yawn
2017-09-09 22:24:11 +02:00
Belsima
7e869591c3 more genders 2017-09-09 16:14:56 -04:00
Anewbe
fa38d674c4 Merge pull request #3781 from Belsima/mouse
Adds a new death sound for mice.
2017-09-09 15:34:49 -04:00
Anewbe
160f45721b Merge pull request #3801 from Belsima/spiderdesc
Makes giant spider descriptions respect their sprites.
2017-09-09 15:22:30 -04:00
Belsima
b10e5c2dee Makes giant spider descriptions respect their sprites. 2017-09-09 13:16:52 -04:00
Belsima
77c679b280 Adds a non-gendered biological option for prometheans. 2017-09-09 13:09:23 -04: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
6eb472f31d Revert "Adds a new event - Solargrubs!" 2017-09-09 12:24:37 -04:00
Spades
6038c0a81f Merge pull request #2108 from Ketrai/master
Adds a new event - Solargrubs!
2017-09-09 12:24:26 -04:00
Spades
dd53e67a92 Merge pull request #2126 from Cameron653/PAI_ENTER
Allows ghosts to become a pAI
2017-09-09 12:21:59 -04:00
Spades
d17c851ea0 Merge pull request #2114 from Funce/Borg-ooc-fix-take2
Silicon OOC prefs fix TAKE 2
2017-09-09 12:21:23 -04:00
Cameron653
efcd5e0795 Update death.dm 2017-09-08 23:21:25 -04:00
Belsima
61e23886cb Adds sounds for chopping wood. 2017-09-08 17:15:48 -04:00
Belsima
07af33339c Adds a new death sound for mice. 2017-09-08 16:52:36 -04:00
Anewbe
84fa9cf785 Merge pull request #3770 from Mechoid/Xeno_Tyranny_Electric_Boogaloo
Xenomorph Tweaks/Buffs.
2017-09-08 16:19:22 -04:00
MisterLayne
8d1649b703 Fixes pAI getting stuck after user leaves the game while the pAI is still unfolded. 2017-09-07 17:21:08 -04:00
Funce
34266c2911 Adds OOC prefs to AI holograms 2017-09-07 15:43:22 +12:00
Funce
25ce01bebd Quick check added to prevent possible runtimes 2017-09-07 14:10:54 +12:00
Mechoid
98af877b21 Xenomorph Tweaks/Buffs. 2017-09-06 13:37:43 -07:00
Funce
df33837b54 pAI's (When in chassis form) now also get OOC prefs 2017-09-06 16:05:00 +12:00
Funce
9629b4ba0c You can now see Borg OOC prefs when you aren't the borg now 2017-09-06 16:04:27 +12:00
Neerti
5c8140ee0b Removes some world << output, fixes a few bugs. 2017-09-05 22:52:46 -04:00
kcin2001
4da31bfdd1 changing the blurb to be more like what yosh said it should be 2017-09-05 12:06:32 -07:00
Ketrai
674b310973 Adds new mob solargrub
New mob
2017-09-05 16:04:05 +02:00