Commit Graph

22192 Commits

Author SHA1 Message Date
Sebbe
706a70a643 Fixes icky voremob mistakes.
I made some initial faults when porting voremobs in the first wave, this aims at rectifying those mistakes.
2019-03-04 15:04:20 +01:00
Neerti
0565cc41c1 Merge pull request #5986 from Anewbe/rings
Rings no longer cover ones hands
2019-03-04 08:16:27 -05:00
Unknown
cd5899b6d3 Fixes mobs falling off aerostat 2019-03-03 07:43:04 -05:00
Unknown
66c35a6d6d More Fixes 2019-03-03 07:28:28 -05:00
Heroman
87f89f2728 Fixed elevator button being borked 2019-03-03 18:16:02 +10:00
Unknown
856b320091 Fixes Newspapers 2019-03-02 20:52:07 -05:00
Spades
76633d35b2 Merge pull request #4566 from VOREStation/upstream-merge-5746
[MIRROR] Adds like 4 million articles.
2019-03-02 08:24:45 -05:00
Spades
43c03b3b82 Merge pull request #4565 from VOREStation/upstream-merge-5757
[MIRROR] Adds several new map/event oriented objects
2019-03-02 08:24:32 -05:00
Spades
af14eaef05 Merge pull request #4563 from VOREStation/upstream-merge-5756
[MIRROR] Fixes a few AI bugs
2019-03-02 08:24:15 -05:00
Spades
d47c2366de Merge pull request #4558 from VOREStation/upstream-merge-5760
[MIRROR] Adds BIOACID damage type
2019-03-02 08:10:04 -05:00
Spades
bd8c62bde8 Merge pull request #4557 from VOREStation/upstream-merge-5758
[MIRROR] Fixes several bugs with AI mobs
2019-03-02 08:09:55 -05:00
Spades
4320afc530 Merge branch 'master' into upstream-merge-5757 2019-03-02 08:05:51 -05:00
Spades
41bcb6a729 Merge pull request #4805 from Sebbe9123/master
Changes vore egg_types to not interfere with mob egg_types.
2019-03-02 08:03:58 -05:00
Spades
0aac0a8ebb Merge branch 'master' into upstream-merge-5756 2019-03-02 08:03:30 -05:00
Spades
f7b300ac68 Merge branch 'master' into upstream-merge-5758 2019-03-02 08:01:51 -05:00
Spades
629eebd803 Merge pull request #4555 from VOREStation/upstream-merge-5654
[MIRROR] Makes math helpers defines for performance
2019-03-02 07:57:57 -05:00
Unknown
fe43d06351 Fixes Mob Vore 2019-03-01 22:03:44 -05:00
Unknown
690ecfdbdf Fixes Digestion Toggle
...Not sure why this was disabled, it is an easy fix.
2019-03-01 19:35:36 -05:00
TheFurryFeline
02ef9c29ed Typo fix 2019-03-01 15:05:47 -05:00
TheFurryFeline
eaf41744e1 Typo fix 2019-03-01 15:05:18 -05:00
TheFurryFeline
997fe12dc7 Minor Change
Phi Ahkeen -> Phi Viesti
2019-03-01 14:16:47 -05:00
TheFurryFeline
e167b25f4c Add Resh's HOS Coat
So, I saw a thing on forums here, https://forum.vore-station.net/viewtopic.php?f=26&t=1519 and thought, 'hey, I can fix that.' So, here we are. :> Also adjusts Phi's last name - in the comment for the listing - as I've seen it in-game, back to Viesti.
2019-03-01 14:00:58 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Mewchild
4c8f4bcc17 Makes it a proc everywhere 2019-02-28 00:28:53 -06:00
Mewchild
b33b089a91 And shuts up travis 2019-02-28 00:11:57 -06:00
Mewchild
15b6f812e4 Make it a proc! 2019-02-28 00:10:58 -06:00
Mewchild
97346102b4 Adds damage check. Credits to Heroman 2019-02-28 00:07:57 -06:00
Unknown
9a5065a77f Forgot Vorestation Edit 2019-02-25 09:23:17 -05:00
Unknown
d9ad515056 [5962] Adjustments to PR 4785
- QTR no longer blacklists the character from rejoining.
- Modified notifications to encourage QTR use
2019-02-25 09:13:32 -05:00
Spades
71d1a05531 Merge pull request #4543 from VOREStation/upstream-merge-5747
[MIRROR] Makes fulltile windows seperate from dir
2019-02-25 08:57:19 -05:00
Spades
1a02378f70 Merge pull request #4556 from VOREStation/upstream-merge-5744
[MIRROR] Adds 12 new futuristic loadout clothing items + colour variants
2019-02-25 07:46:24 -05:00
Spades
aedcf169a6 Merge pull request #4539 from VOREStation/upstream-merge-5723
[MIRROR] Promethean Regen tweaks. (The one with the devil's deal.)
2019-02-25 07:41:47 -05:00
Sebbe9123
22c9bd416e changes vore eggtype to not mess with mob eggtype 2019-02-25 12:03:07 +01:00
Sebbe9123
628ae84c15 Changes eggtype to not mess with simple_mobs 2019-02-25 11:58:14 +01:00
Sebbe9123
f1e9a1c7b8 Changes vore eggtype to not mess with simple_mobs 2019-02-25 11:57:27 +01:00
Sebbe9123
7d6f22ae2e gives back egg_type to nurse spider 2019-02-25 11:13:40 +01:00
Heroman3003
885fe76664 Fixes departmental teshari cloaks and coats (#5974)
* Fixes departmental teshari clothes

Some missing vars, icons, misaligned qm undercoat, forgotten edits on some icon names.

* adjusted names and descriptions of departmental teshari cloaks

* Brought loadout entries to match existing ones.

* Puts RD on command tesh stuff WL, removes leftover comment

* Fixes a one-space typo in QM tesh cloak description.
2019-02-24 17:15:30 -05:00
Mewchild
0e13e14693 Antiseptic Mlems take 3 2019-02-24 14:58:57 -06:00
Heroman3003
6740b839fc Returns ability for prometheans to eat dirt 2019-02-24 06:44:02 +10:00
Heroman3003
bffe666af7 Preserves vorestation removals while porting tweaks 2019-02-24 06:38:54 +10:00
Unknown
a4317b1910 [5654] Makes this PR Compile
This one made me cry.
2019-02-23 12:30:16 -05:00
Spades
4b19e3a9b3 Merge pull request #4538 from VOREStation/upstream-merge-5726
[MIRROR] Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed
2019-02-23 12:01:38 -05:00
Spades
14fad52791 Merge branch 'master' into upstream-merge-5744 2019-02-23 11:51:40 -05:00
Spades
b7c90be1b0 Extended the expiration time 2019-02-23 11:49:19 -05:00
Spades
190ead1dfd Merge pull request #4552 from VOREStation/upstream-merge-5748
[MIRROR] Adds ability to selectively disable submap rotation.
2019-02-23 11:45:49 -05:00
Spades
172f2088db Merge pull request #4790 from Sebbe9123/upstream-merge-5735
More AI fixes, fixes crates, spawners, adds ION spiders and MORE.
2019-02-22 20:42:29 -05:00
Heroman3003
0171fa3faa Cleanup of Tempest saddlebag code 2019-02-23 06:37:57 +10:00
Sebbe9123
aabb168bf4 retries a fix I did before. 2019-02-22 17:48:08 +01:00
Sebbe9123
dea8170bc0 Removes an indentation someone made. 2019-02-22 17:14:02 +01:00
Unknown
f74f7c3e42 Ports Shadekin (Minus AI) 2019-02-21 20:47:22 -05:00