Commit Graph

8049 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
kcin2001
e347c4f8b4 Merge branch 'master' into Harpy 2017-09-04 20:53:45 -07:00
Kameren Arch
fde4f1fb5d adds 4 more monkeys to tf into
sparra, wolpin, sobaka, and saru
2017-09-04 13:32:26 -04:00
kcin2001
c16d91235c harpy to Rapala and harpy marking name changes 2017-09-03 13:48:00 -07:00
kcin2001
997c96c3a9 Harpy to Rapala 2017-09-03 13:45:57 -07:00
kcin2001
30d4fbf591 changing attacks to be just like humans since they dont have claws/sharp teeth 2017-09-03 13:42:30 -07:00
kcin2001
57e0401365 changes harpy names to rapala/rapalans 2017-09-03 00:29:18 -07:00
Spades
68ac3454be Merge pull request #2034 from kcin2001/master
Adds xeno heads to be used with xeno hybrids and xenolike races
2017-09-02 22:04:42 -04:00
Spades
c89512940f Merge pull request #2089 from Verkister/ghostboop
Adds a ghost verb to alert blank pAI cards.
2017-09-01 18:11:20 -04:00
Verkister
f47db4995b Adds a ghost verb to alert blank pAI cards.
-The verb causes available empty pAI devices to briefly flash an alert on their screens.
-Didn't add the sound part due to spam protections failing for the sake of annoyance prevention. Just gotta hope someone walks right past when ya do it.
-You can now indicate the things might actually be of use for once without having to resort to metabegging.
2017-09-01 12:52:52 +03:00
kcin2001
49993645bf makes xeno heads ears and fixes the colorable mature inkling ears hair 2017-08-31 21:22:08 -07:00
kcin2001
3782078634 adds harpy code 2017-08-31 18:52:06 -07:00
kcin2001
7f4eec0cf9 adds harpy markings 2017-08-31 18:48:59 -07:00
Yoshax
19c047a4ae Removes whitelist requirements from Daemon and Enochian 2017-08-31 22:33:31 +01:00
Spades
4812374d56 Merge pull request #2076 from AaronSherwood117/master
Adds Handshakes and Head Patting
2017-08-29 14:37:08 -04:00
Spades
cc75893ba2 Merge pull request #2073 from Cameron653/master
Late August Polaris Sync
2017-08-29 13:54:55 -04:00
Aaron Sherwood
507bd3e708 Add Headpats and Handshakes
Thanks to Cameron for helping get this working. Been way too long since
I started trying to learn DM.

Target either hand or the head on help intent (with an empty hand) and
you can now perform classic human greetings and/or pet people!
2017-08-29 05:40:00 -05:00
Spades
7ca531181b Merge pull request #2075 from Funce/dev/borg-assorted-fixes
Medical Borgs Assorted Fixes
2017-08-29 04:13:20 -04:00
Funce
c0d28be09f Changes comments to be more find-friendly 2017-08-29 19:10:27 +12:00
Funce
292f045733 Changes Comment to be more Find-friendly 2017-08-29 19:06:05 +12:00
Funce
13d64875ff Finally fixes borg OOC prefs 2017-08-29 14:41:10 +12:00
Funce
b329860e50 Adds crew monitor to medihound 2017-08-29 14:38:20 +12:00
Funce
bf259427ca Fixes medical borgs being unusable 2017-08-29 14:37:50 +12:00