cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 21:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,992 Commits 9 Branches 26 Tags
ff8d89db0731d269c1173becfc0ef30b885ed49c
Commit Graph

10053 Commits

Author SHA1 Message Date
Verkister
ff8d89db07 Merge pull request #5325 from Verkister/ridethesausage 
Brings back oties and adds riding.
 2019-06-13 14:25:39 +03:00
Verkister
de0749bff3 damage nerf 2019-06-11 08:31:20 +03:00
Novacat
8680ad38c7 Merge pull request #5328 from Heroman3003/goosefix 
Fixes geese escaping the wilderness
 2019-06-10 18:53:04 -04:00
Heroman
0c1ea5c98d Replaces different AI with shutters 2019-06-11 07:11:20 +10:00
Novacat
ea38a066fe Merge pull request #5329 from VOREStation/Verkister-patch-2 
Fixes rapala missing base_color
 2019-06-10 13:18:31 -04:00
Verkister
ea2c7077c7 Fixes rapala missing base_color 
-Basically fixes adminspawned rapala and the prosthetic limbs coming out blank white.
-Also snips out some irrelevant copypasta residue.
 2019-06-10 13:16:18 +03:00
Heroman
d6c295b226 Fixes geese escaping the wilderness 2019-06-10 17:32:13 +10:00
Verkister
d3fad1a1e6 Brings back oties and adds riding. 
-Brings back oties. Currently adminspawn only though.
-Certain niche features still missing such as sec versions reacting to crime.
-Added red guard version.
-Tamed ones can still be befriended etc.
-Minor fixes to sprites and file naming.
-Adds riding to player controlled oties and corrupt hounds.
 2019-06-09 13:26:29 +03:00
Verkister
8d01927aa7 Engie dog fixes and tweaks. 
-Gives engie dog basic magnetic and circuit grippers.
-Fixes the decompiler halving the amount on ingested sheets.
-Doubles the nerfed matter reserve recharge rates and their starting amount.
 2019-06-09 11:54:19 +03:00
Verkister
dea9e242fa Fixes borgs spinning on pounce 2019-06-05 18:28:44 +03:00
Novacat
78852d29eb Merge pull request #5311 from VOREStation/upstream-merge-6192 
[MIRROR] Prevents amber slime feeding from healing slimes
 2019-06-04 13:45:37 -04:00
Novacat
6ff16ce859 Update subtypes.dm 2019-06-04 13:30:01 -04:00
Atermonera
452af8a682 Prevents amber slime feeding from healing slimes 2019-06-04 13:16:27 -04:00
Atermonera
8be2258428 Merge pull request #6185 from chaoko99/medibots 
lowers the minimum treatment bound of medibots.
 2019-06-04 13:12:43 -04:00
Novacat
db88e4ce47 Merge pull request #5297 from Heroman3003/mercrename 
Renames Syndicate Commandos to Mercenary Commandos
 2019-06-02 13:07:54 -04:00
Heroman
34115d5a48 Renames Syndicate Commandos to mercs 2019-06-02 17:49:37 +10:00
Novacat
ae20565d46 Merge pull request #5286 from VOREStation/upstream-merge-6154 
[MIRROR] Sif Trees and Icon Scaling
 2019-05-30 13:15:12 -04:00
Unknown
c7333d5a30 Conflict Resolution 2019-05-30 13:04:41 -04:00
Atermonera
f78a4e1dc8 Sif Trees and Icon Scaling 2019-05-28 13:21:39 -04:00
Atermonera
0a8c048eb6 Merge pull request #6176 from GeneriedJenelle/patch-2 
Fixes graveyard drones becoming antag
 2019-05-28 13:12:55 -04:00
Novacat
10a1f2f0ed Update borer.dm 2019-05-24 02:04:10 -04:00
Atermonera
38e657c83f Borers TLC 1 2019-05-24 02:01:56 -04:00
mistyLuminescence
42cc20278e Big Bugfix Bonanza 2019-05-23 12:59:29 -04:00
Mechoid
7a35723d85 Sif Animal Expansion 1 2019-05-21 19:58:19 -04:00
Heroman3003
6f80f45eed Ports character setup subsystem 2019-05-14 11:48:34 +10:00
Novacat
7322cbf7fb Merge pull request #4906 from Sebbe9123/Disbot 
Adds new robit, to discourage facetanking.
 2019-05-11 17:59:16 -04:00
Novacat
25585908b3 Switches to Expired Medicine 2019-05-11 17:49:24 -04:00
Neerti
abd1b97d10 Merge pull request #6159 from Heroman3003/youcantcatchme 
Allows objects to be made uncatchable
 2019-05-09 16:40:23 -04:00
Sebbe
1a9cfe3be6 fixes complaints after bored hiatus 2019-05-09 09:43:36 +02:00
Heroman
ad21685c86 Adds astolfo hairstyle 2019-05-09 07:47:32 +10:00
Atermonera
90ee680dd5 Fishing! 2019-05-06 14:16:27 -04:00
Novacat
09b8cbba7c Merge pull request #5159 from Heroman3003/filling-up-the-underdark 
Adds a bunch of new points of interest to Underdark
 2019-05-02 08:51:27 -04:00
Novacat
faa007bddf Merge pull request #5136 from Heroman3003/solargrubs-return-bring-the-hate-in 
Solargrub hibernation season is over
 2019-05-02 08:51:04 -04:00
Novacat
e14cbd5aa5 Merge pull request #5161 from Novacat/nova-heterochromia 
Miscellaneous Fixes
 2019-05-02 03:56:26 -04:00
Heroman
ff9e4f2e4a Makes Flavor Text properly required for joining 2019-05-02 14:40:13 +10:00
Unknown
8d5fd87b4b More Shadekin AI 2019-05-01 19:09:20 -04:00
Unknown
20a827cde8 Adds AI for all the other shadekin types 2019-05-01 19:06:45 -04:00
Heroman
d7fcd6b96a Merge branch 'master' into filling-up-the-underdark 2019-05-01 17:56:28 +10:00
Heroman3003
4c7c020b6f Fixes mimics not being vore active 2019-04-30 12:28:56 +10:00
Heroman
1b87b38c4a More PoIs 2019-04-30 05:39:42 +10:00
Sebbe
80cb2de7b7 spellcheck 2019-04-29 08:21:28 +02:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Heroman3003
66dfa403f5 sans work 2019-04-29 11:35:41 +10:00
Neerti
cf1588441f Merge pull request #6139 from Mechoid/FixACTDStuff 
Fixes Access Code Transmission Device oversight.
 2019-04-28 20:12:14 -04:00
Heroman3003
b692c1899a Merge branch 'master' into filling-up-the-underdark 2019-04-29 09:06:56 +10:00
Novacat
b9a1fa29d6 Merge pull request #5111 from Heroman3003/people-cant-have-nice-things 
Removes glucose autoinjectors from vendomats, makes Zaddat spawn with a bunch
 2019-04-27 22:49:53 -04:00
Novacat
76bf550299 Merge pull request #5146 from VOREStation/upstream-merge-6129 
[MIRROR] Allows liquidfoods to be eaten through protective gear
 2019-04-27 22:49:20 -04:00
Novacat
958a5b6645 Merge pull request #5142 from VOREStation/upstream-merge-6058 
[MIRROR] Removes umbrella permastuns. Adds wind mechanics.
 2019-04-27 22:42:42 -04:00
Atermonera
8f3f8ad80f Allows liquidfoods to be eaten through protective gear 2019-04-27 19:54:46 -04:00
Atermonera
31a79f0c28 Merge pull request #6068 from Mechoid/WhatWasWillBe 
Re-adds the Space Worm.
 2019-04-26 19:33:43 -04:00