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
44,252 Commits 9 Branches 26 Tags
fed4b51b3970aec079bca4af101616124f838521
Commit Graph

21328 Commits

Author SHA1 Message Date
Arokha Sieyes
fed4b51b39 Dumb typo on protean messages 2018-09-28 23:11:57 -04:00
Neerti
50decef580 Merge pull request #5576 from Anewbe/dermal_implant_fix 
Dermal implant doesn't cover hair
 2018-09-19 16:08:37 -04:00
Spades
cccad0f12e Merge pull request #4124 from VOREStation/upstream-merge-5465 
[MIRROR] Removes supermatters from cave PoIs.
 2018-09-17 14:12:25 -04:00
Spades
c29cea0e9f Merge pull request #4123 from Zap-zapper/sleevemate 
[FEATURE]Sleevemate new functions
 2018-09-17 14:12:07 -04:00
Spades
b59fd4b551 Merge pull request #4122 from VOREStation/upstream-merge-5464 
[MIRROR] Makes arcing projectiles exist in the code.
 2018-09-17 14:11:46 -04:00
Spades
2480396c02 Merge pull request #4120 from VOREStation/upstream-merge-5460 
[MIRROR] APC Sprite Change
 2018-09-17 14:06:42 -04:00
Spades
089655639b Merge pull request #4114 from VOREStation/upstream-merge-5458 
[MIRROR] Let beams be shown in the Type var selection in View Variables.
 2018-09-17 14:05:30 -04:00
Spades
22acaf3fcd Merge pull request #4092 from VOREStation/upstream-merge-5443 
[MIRROR] Two pAI fixes
 2018-09-10 12:32:59 -04:00
Spades
c5772cf6a0 Update pai.dm 2018-09-10 07:04:03 -04:00
Spades
e51a5f18b5 Update pai.dm 2018-09-10 07:03:30 -04:00
Spades
eb94467f39 Merge branch 'master' into upstream-merge-5432 2018-09-09 17:57:31 -04:00
Spades
4135792153 Merge pull request #3941 from Verkister/botmount 
Adds dogborg riding.
 2018-09-09 17:56:13 -04:00
Spades
39dff7d319 Merge pull request #4060 from VOREStation/upstream-merge-5421 
[MIRROR] Mining turfs maybe probably possibly look nice all the time now I hope?
 2018-09-09 17:55:52 -04:00
Heroman3003
ae6c668a9d re-added Shellguard Noble sprites (by Travelling Merchant) 2018-09-08 21:24:10 +10:00
Atermonera
7c519f44ed Merge pull request #5514 from TravellingMerchant/master 
Removes Shellguard Noble cyborg sprites.
 2018-09-06 20:52:54 -04:00
Spades
f4f532693e Merge pull request #4100 from VOREStation/upstream-merge-5449 
[MIRROR] Speeds up alcohol ingested effects
 2018-09-01 17:31:35 -04:00
Spades
7b86d2ba4f Merge pull request #4099 from VOREStation/upstream-merge-5450 
[MIRROR] Fixed mining cloak not being in loadouts
 2018-09-01 17:31:06 -04:00
Spades
35f3e81ca3 Merge pull request #3940 from Verkister/buttmount 
Reworks taur riding system.
 2018-09-01 17:25:23 -04:00
Zap-zapper
b0a0a1e276 Protection from impersonation. Updated to 3700 2018-08-22 17:47:11 +07:00
Spades
64484a6591 Merge pull request #4095 from VOREStation/upstream-merge-5442 
[MIRROR] Admin Supermatter Setup now closes the monitoring room shutters
 2018-08-21 05:41:49 -04:00
Spades
1e38ff859b Merge pull request #4080 from Verkister/honkery 
Couple clown tweaks.
 2018-08-20 08:07:07 -04:00
Spades
a8f8631cfe Merge pull request #4108 from VOREStation/upstream-merge-5453 
[MIRROR] Replaces Skrell namegen
 2018-08-20 08:06:37 -04:00
Spades
eee6cc7337 Merge pull request #4107 from Eearslya/patch-1 
Fix minor typo in vore attempt warning
 2018-08-20 08:01:09 -04:00
Spades
1e27743718 Merge pull request #4087 from VOREStation/upstream-merge-5445 
[MIRROR] Constant Chip has a sprite
 2018-08-17 16:12:57 -04:00
Spades
887899f50b Merge pull request #4082 from VOREStation/upstream-merge-5439 
[MIRROR] Fixes layering issues for a few things
 2018-08-17 16:12:12 -04:00
Spades
e6f2a72d92 Merge pull request #4075 from VOREStation/upstream-merge-5433 
[MIRROR] Limits fire_stacks on mobs by temperature
 2018-08-17 16:11:40 -04:00
Spades
69c0cd8b8c Merge pull request #3983 from Verkister/synthmarking 
Couple VS compatibility tweaks on the synthlimb markings option.
 2018-08-17 16:09:56 -04:00
Spades
f4a28a179c Merge pull request #4069 from VOREStation/upstream-merge-5430 
[MIRROR] Fixes a few on-mob gun sprites
 2018-08-17 16:07:50 -04:00
Spades
6f35a33e1c Merge pull request #4068 from VOREStation/upstream-merge-5429 
[MIRROR] Adds Marking Order Changing at Character Creation
 2018-08-17 16:07:33 -04:00
Spades
6a95420bf9 Merge pull request #4064 from VOREStation/upstream-merge-5426 
[MIRROR] Fixes a few bugs associated with the Dead Ringer
 2018-08-17 16:07:16 -04:00
Spades
bf98b4238d Merge pull request #4063 from VOREStation/upstream-merge-5425 
[MIRROR] Adds an indent formatting tag to paper
 2018-08-17 16:06:56 -04:00
Spades
ddba78b5a8 Merge pull request #4062 from VOREStation/upstream-merge-5428 
[MIRROR] Fixes anomaly suits being invisible. For real this time.
 2018-08-17 16:06:44 -04:00
Spades
7ace233760 Merge pull request #4105 from ArgobargSoup/master 
Cosmetic tweaks for catgirls.
 2018-08-17 16:06:22 -04:00
Spades
7bec3f26aa Merge pull request #4152 from VOREStation/upstream-merge-5487 
[MIRROR] PENGUINS ARE FROM EARTH
 2018-08-17 16:06:02 -04:00
Spades
db804f02ee Merge pull request #4061 from VOREStation/upstream-merge-5423 
[MIRROR] Implements ways to make floors not get dirty
 2018-08-16 05:44:19 -04:00
Spades
6919cca96d Merge pull request #4070 from Knightfall5/master 
Ashley's fluff item
 2018-08-15 18:36:28 -04:00
Verkister
85a7c2d7d4 snip 2018-08-14 09:16:42 +03:00
Verkister
6cb51f741a Merge branch 'master' into synthmarking 2018-08-14 09:09:14 +03:00
Spades
84a3d824de Merge pull request #3885 from Cameron653/ALRAUNE_STUFF 
Alraune abilities and minor code changes
 2018-08-13 07:50:23 -04:00
Spades
ed06781743 Merge pull request #3759 from Verkister/belletweakins 
Dogborg equipment/belly tweaks and fixes. (Ready)
 2018-08-13 07:49:55 -04:00
Anewbe
1d44e34e85 Merge pull request #5487 from elgeonmb/patch-8 
PENGUINS ARE FROM EARTH
 2018-08-09 15:55:00 -04:00
Atermonera
1855b9e7b9 Merge pull request #5465 from Neerti/crystal_fix 
Removes supermatters from cave PoIs.
 2018-08-03 19:20:27 -04:00
Anewbe
972486dde0 Merge pull request #5464 from Neerti/arc_projectile_fix 
Makes arcing projectiles exist in the code.
 2018-08-03 11:37:16 -04:00
Atermonera
22f91f07a5 Merge pull request #5460 from Woodratt/07312018_apcspritechange 
APC Sprite Change
 2018-08-02 15:25:41 -04:00
Nadyr
28974eaf2d Fixed a grammatical error in shadekin hold flavor text. 2018-08-01 20:05:48 -05:00
Sharkmare
229887eb55 Proteans now able to use Teshari DSI prosthetics 2018-08-01 23:52:02 +02:00
Neerti
0ca3915b83 Merge pull request #5458 from Mechoid/Beams_Finally 
Let beams be shown in the Type var selection in View Variables.
 2018-08-01 16:29:29 -04:00
Baguette
34f7d86791 Replaces Skrell namegen (#5453) 
Created a first name list for Skrell, to replace the syllable assembler.

Created a surname list for Skrell to replace the syllable assembler.

Replaced the Skrell namegen with pre-written namelists, instead of the old syllable assembler.
 2018-07-30 05:10:40 -04:00
Eearslya Sleiarion
572f7e1623 Fix minor typo in vore attempt warning 2018-07-30 00:30:33 -07:00
ArgobargSoup
403ee2eba5 Cosmetic tweaks for catgirls. 2018-07-29 14:08:11 -07:00