Commit Graph

9686 Commits

Author SHA1 Message Date
Spades fc959cd1e8 Removes redundant files 2019-01-07 09:36:11 -05:00
Spades 5cb647993c Conflicts resolved, excluding the .dme 2019-01-05 16:38:33 -05:00
Spades 58e4a98a94 Breaks a Vorestation Edit in death.dm
Nobody wants to help me fix these things so I'm just going to break them
and see what happens.
2019-01-05 16:35:07 -05:00
Atermonera 2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Screemonster 13559450d2 spread the seeds 2018-11-11 12:52:16 +00:00
Wickedtemp 858dbd6ddf Allows for Whitelst
As per the SCA for Tempest being approved, and so Zal doesn't have to manually add it to their character every time they log in.
2018-11-06 22:05:12 -06:00
Aronai Sieyes 3b5b03e05b Merge pull request #4471 from VOREStation/upstream-merge-5701
[MIRROR] Update silicon manifest to discord dark theme.
2018-11-05 15:25:41 -05:00
Neerti bcf58840d0 Merge pull request #5701 from lbnesquik/Kates-Ai-Manifest-Fix
Update silicon manifest to discord dark theme.
2018-10-30 18:42:47 -04:00
Aronai Sieyes 816a5c9a57 Fix mistyped macro and indent 2018-10-25 17:35:42 -04:00
Andrei Jors 9fb6894a07 Brings this over from Citadel. Ignore the CITADEL CHANGE comments. 2018-10-25 17:16:05 -04:00
Heroman3003 dde664c1fb Added intelligence levels to some virgo mobs 2018-10-21 07:49:49 +10:00
Spades c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor
Replaces awoo with wolfgirl
2018-10-20 08:56:14 -04:00
Spades 6d3b8812f5 Merge pull request #4344 from Novacat/nova-heterochromia
Reverts species settings
2018-10-20 08:52:05 -04:00
Heroman3003 1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
Spades ea12d3d18c Merge pull request #4328 from lbnesquik/Kates-Citborg-Port
Dogborgs start with full water reserves.
2018-10-17 17:28:51 -04:00
Neerti 62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -04:00
Unknown d91b8af845 Requested Changes 3 2018-10-16 14:04:05 -04:00
Spades 5b755d757a Merge pull request #4396 from VOREStation/upstream-merge-5674
[MIRROR] Removes maintenance access from cleanbots
2018-10-15 17:32:14 -04:00
Anewbe 935fb1ed06 Merge pull request #5669 from VOREStation/pol-binocs
Stop usage of multiple vision modifiers
2018-10-15 15:51:43 -04:00
Anewbe 8ccd796753 Merge pull request #5674 from Nalarac/patch-1
Removes maintenance access from cleanbots
2018-10-15 15:50:13 -04:00
Anewbe 51a493427d Graves (#5622)
* Adds support for closets storing closets, and graves

* More Grave Things
2018-10-13 17:58:48 -04:00
lbnesquik 56ff73f57c Makes water related changes shorter. 2018-10-13 09:40:35 +02:00
Spades 4bea97df74 Merge pull request #4360 from lbnesquik/Kates-Flight-Tweak
Adjust winged flight cost and description.
2018-10-12 19:21:36 -04:00
Spades 85bcb03327 Merge pull request #4361 from lbnesquik/Kates-Catgirl-Tweak
Makes it so standard catgirls can appear.
2018-10-12 19:18:52 -04:00
Spades 561f196591 Merge pull request #4336 from Screemonster/pouncechanges
Gives pounces a chance to fail
2018-10-12 19:18:29 -04:00
Unknown ccbf7cf28c Requested Changes 2 2018-10-12 13:53:53 -04:00
Screemonster f513ca75bb use the proper proc for this thing 2018-10-12 15:34:02 +01:00
lbnesquik 7bde126b8c Fixes weird typos. 2018-10-12 15:49:27 +02:00
lbnesquik 941896a165 Makes it so standard catgirls can appear. 2018-10-12 12:34:30 +02:00
lbnesquik 95445d808d Reduce Flight cost 2018-10-12 12:24:30 +02:00
Unknown bb0905d3dc Skrell no longer get sick from meat 2018-10-12 06:16:34 -04:00
Spades 6f48c01382 Merge pull request #4333 from kcin2001/fixes
fixes copy paste error
2018-10-12 06:00:28 -04:00
Screemonster 7d6731f39e shove this shit in procs 2018-10-12 06:40:17 +01:00
Unknown 8acba5d7a4 Requested Changes 1 2018-10-12 00:29:05 -04:00
Aronai Sieyes a84074572a Merge pull request #4338 from Screemonster/shadefluffers
Minor shadekin fixes
2018-10-11 23:52:18 -04:00
Aronai Sieyes 79d590140e Merge pull request #4347 from VOREStation/upstream-merge-5617
[MIRROR] Admin ticket system (for real this time)
2018-10-10 21:22:59 -04:00
Spades 12b0f7fdff Merge pull request #4342 from VOREStation/upstream-merge-5635
[MIRROR] Fix yes emote not working correctly.
2018-10-10 05:27:04 -04:00
Spades ae8b60f0d8 Merge pull request #4341 from VOREStation/upstream-merge-5634
[MIRROR] Remove kobold.dm
2018-10-10 05:26:42 -04:00
Anewbe e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -04:00
Unknown cf310be356 Reverts species settings to Polaris
With custom species existing now, there is no reason to have many of the species specific 'flavor' attributes commented out.

Some changes/reversions can be made based on feedback. Feedback welcome.

Adjustments made based on case situations:
- Tajaran heat discomfort treshhold increased by 2 kelvin (prevents heat discomfort spam at 20c)
2018-10-09 14:22:32 -04:00
Atermonera 6be6f9a957 Merge pull request #5635 from lbnesquik/Kates-Emote-Fix
Fix yes emote not working correctly.
2018-10-09 13:48:35 -04:00
Atermonera 6b6f811278 Merge pull request #5634 from lbnesquik/Kates-Kobold-Remov
Remove kobold.dm
2018-10-09 13:44:16 -04:00
Screemonster e3356ed5fe Xenochimera tweak 2018-10-09 14:12:02 +01:00
Screemonster ebd235ed1e fix pounces for those dirty nonvore types 2018-10-09 13:47:45 +01:00
Screemonster 71f5870b46 Minor shadekin fixes 2018-10-09 13:15:13 +01:00
Screemonster 4faca0b7f8 gives pounces a chance to fail 2018-10-09 11:53:55 +01:00
kcin2001 fb4fcf1e18 fixes copy paste error 2018-10-08 11:58:01 -07:00
Spades ccc1fa30ec Merge pull request #4313 from Novacat/nova-pathfinder
Expedition Balance Tweaks
2018-10-07 18:00:00 -04:00
Spades 311e184fb0 Merge pull request #4311 from lbnesquik/Kates-Hippo-Mob
Hippo mob + Simple mob sounds
2018-10-07 17:59:07 -04:00
Spades 189b724c59 Merge pull request #4305 from lbnesquik/Kates-Observe
Fix misleading alert.
2018-10-07 17:58:46 -04:00