cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,233 Commits 9 Branches 26 Tags
135470adc5f9d6419cce797f1931becb063994fb
Commit Graph
21317 Commits
Author SHA1 Message Date
Mewchild 135470adc5 Medal Whitelists from abduction event 2018-09-12 18:00:21 -05:00
SpadesandGitHub 22acaf3fcd Merge pull request #4092 from VOREStation/upstream-merge-5443 
[MIRROR] Two pAI fixes
 2018-09-10 12:32:59 -04:00
SpadesandGitHub c5772cf6a0 Update pai.dm 2018-09-10 07:04:03 -04:00
SpadesandGitHub e51a5f18b5 Update pai.dm 2018-09-10 07:03:30 -04:00
SpadesandGitHub eb94467f39 Merge branch 'master' into upstream-merge-5432 2018-09-09 17:57:31 -04:00
SpadesandGitHub 4135792153 Merge pull request #3941 from Verkister/botmount 
Adds dogborg riding.
 2018-09-09 17:56:13 -04:00
SpadesandGitHub 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
AtermoneraandVirgoBot 7c519f44ed Merge pull request #5514 from TravellingMerchant/master 
Removes Shellguard Noble cyborg sprites.
 2018-09-06 20:52:54 -04:00
SpadesandGitHub f4f532693e Merge pull request #4100 from VOREStation/upstream-merge-5449 
[MIRROR] Speeds up alcohol ingested effects
 2018-09-01 17:31:35 -04:00
SpadesandGitHub 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
SpadesandGitHub 35f3e81ca3 Merge pull request #3940 from Verkister/buttmount 
Reworks taur riding system.
 2018-09-01 17:25:23 -04:00
SpadesandGitHub 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
SpadesandGitHub 1e38ff859b Merge pull request #4080 from Verkister/honkery 
Couple clown tweaks.
 2018-08-20 08:07:07 -04:00
SpadesandGitHub a8f8631cfe Merge pull request #4108 from VOREStation/upstream-merge-5453 
[MIRROR] Replaces Skrell namegen
 2018-08-20 08:06:37 -04:00
SpadesandGitHub eee6cc7337 Merge pull request #4107 from Eearslya/patch-1 
Fix minor typo in vore attempt warning
 2018-08-20 08:01:09 -04:00
SpadesandGitHub 1e27743718 Merge pull request #4087 from VOREStation/upstream-merge-5445 
[MIRROR] Constant Chip has a sprite
 2018-08-17 16:12:57 -04:00
SpadesandGitHub 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
SpadesandGitHub 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
SpadesandGitHub 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
SpadesandGitHub 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
SpadesandGitHub 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
SpadesandGitHub 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
SpadesandGitHub 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
SpadesandGitHub 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
SpadesandGitHub 7ace233760 Merge pull request #4105 from ArgobargSoup/master 
Cosmetic tweaks for catgirls.
 2018-08-17 16:06:22 -04:00
SpadesandGitHub 7bec3f26aa Merge pull request #4152 from VOREStation/upstream-merge-5487 
[MIRROR] PENGUINS ARE FROM EARTH
 2018-08-17 16:06:02 -04:00
SpadesandGitHub 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
SpadesandGitHub 6919cca96d Merge pull request #4070 from Knightfall5/master 
Ashley's fluff item
 2018-08-15 18:36:28 -04:00
VerkisterandGitHub 85a7c2d7d4 snip 2018-08-14 09:16:42 +03:00
VerkisterandGitHub 6cb51f741a Merge branch 'master' into synthmarking 2018-08-14 09:09:14 +03:00
SpadesandGitHub 84a3d824de Merge pull request #3885 from Cameron653/ALRAUNE_STUFF 
Alraune abilities and minor code changes
 2018-08-13 07:50:23 -04:00
SpadesandGitHub ed06781743 Merge pull request #3759 from Verkister/belletweakins 
Dogborg equipment/belly tweaks and fixes. (Ready)
 2018-08-13 07:49:55 -04:00
AnewbeandVirgoBot 1d44e34e85 Merge pull request #5487 from elgeonmb/patch-8 
PENGUINS ARE FROM EARTH
 2018-08-09 15:55:00 -04:00
Nadyr 28974eaf2d Fixed a grammatical error in shadekin hold flavor text. 2018-08-01 20:05:48 -05:00
SharkmareandGitHub 229887eb55 Proteans now able to use Teshari DSI prosthetics 2018-08-01 23:52:02 +02:00
BaguetteandVirgoBot 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 SleiarionandGitHub 572f7e1623 Fix minor typo in vore attempt warning 2018-07-30 00:30:33 -07:00
ArgobargSoupandGitHub 403ee2eba5 Cosmetic tweaks for catgirls. 2018-07-29 14:08:11 -07:00
AtermoneraandVirgoBot ff1c9dd020 Merge pull request #5449 from Anewbe/booze 
Speeds up alcohol ingested effects
 2018-07-29 02:55:16 -04:00
AtermoneraandVirgoBot 966261c6d9 Merge pull request #5450 from Heroman3003/mining-cloak-fix 
Fixed mining cloak not being in loadouts
 2018-07-29 02:55:02 -04:00
AnewbeandVirgoBot 5c2d57e43b Admin Supermatter Setup now closes the monitoring room shutters (#5442) 
* Admin Supermatter Setup now closes the monitoring room shutters

* Fixes a copy-paste error
 2018-07-28 01:09:01 -04:00
AnewbeandVirgoBot 4f83e7670c Two pAI fixes 2018-07-27 19:52:31 -04:00
NeertiandVirgoBot 96d5f49091 Merge pull request #5445 from Anewbe/memory_circuit_sprite 
Constant Chip has a sprite
 2018-07-27 02:16:47 -04:00
AnewbeandVirgoBot 0abdfff854 Merge pull request #5439 from Neerti/layer_fixes 
Fixes layering issues for a few things
 2018-07-25 17:27:05 -04:00
Verkister 74d0bd8763 Couple clown tweaks. 
-Allows our responsible whitelist clowns spawn with the bikehorn.
-Disables the destructive forced name randomization and lossy rename BS on join.
 2018-07-25 10:54:59 +03:00
AnewbeandVirgoBot f5312bcedd Refactors supply controller 2018-07-24 11:04:16 -04:00
AnewbeandVirgoBot 002d3a2bd2 Merge pull request #5433 from Atermonera/fire_limit 
Limits fire_stacks on mobs by temperature
 2018-07-24 11:01:58 -04:00
Cameron653andGitHub 5fc76df183 Merge branch 'master' into ALRAUNE_STUFF 2018-07-23 20:08:30 -04:00
Knightfall5andGitHub aa5a02c51b Update custom_items_vr.dm 2018-07-23 02:16:30 -04:00