cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 11:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
59,822 Commits 9 Branches 26 Tags
a8ffbce1419e5deada8d8f96c5ebf2db8d05f20e
Commit Graph
59822 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
klaasjared a8ffbce141 Base Commit 2021-08-14 02:21:47 -04:00
Aronai SieyesandGitHub 599c79a0ce Merge pull request #11415 from VOREStation/upstream-merge-8207 
[MIRROR] Farmbot can be turned off, not just on
 2021-08-13 23:01:20 -04:00
Aronai Sieyes 68043127c9 Mergey fixy merge 2021-08-13 22:44:58 -04:00
Aronai SieyesandGitHub 7923f586ab Merge pull request #11413 from VOREStation/upstream-merge-8201 
[MIRROR] Dethrone The ERP King
 2021-08-13 21:20:19 -04:00
Aronai SieyesandGitHub e46fc922f0 Merge pull request #11414 from VOREStation/upstream-merge-8204 
[MIRROR] Fixes Rat Description Typo
 2021-08-13 21:06:58 -04:00
SchnayyandVirgoBot 3cd0b17ed9 Farmbot can be turned off, not just on 2021-08-13 18:39:55 -04:00
VirgoBot 53ea365efb Fixes Rat Description Typo 2021-08-13 18:37:46 -04:00
SchnayyandVirgoBot 073fe2a658 Merge pull request #8204 from Cerebulon/ratsratsrats 
Fixes Rat Description Typo
 2021-08-13 18:37:46 -04:00
VirgoBot b1a66f1b72 Dethrone The ERP King 2021-08-13 18:36:37 -04:00
SchnayyandVirgoBot aa5742d869 Merge pull request #8201 from Cerebulon/erpking 
Dethrone The ERP King
 2021-08-13 18:36:37 -04:00
barrabobaboGitHubAronai Sieyes
 		2587ebe169 Add default zorren tail to character setup menu (#11383) 
* Add default zorren tail to character setup menu

* Add default zorren tail to character setup menu

* Update code/modules/mob/new_player/sprite_accessories_tail_vr.dm

Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2021-08-13 11:55:28 -04:00
Aronai SieyesandGitHub 4eaaa68557 Merge pull request #11400 from VOREStation/nanomaps_generation 
Automatic NanoMap Update
 2021-08-13 11:55:12 -04:00
Aronai SieyesandGitHub f782d1f0cc Merge pull request #11381 from VOREStation/Arokha/quadalign 
Tweak quad HUD icons alignment
 2021-08-13 11:43:21 -04:00
NanoMap Generation c13063f725 NanoMap Auto-Update (Fri Aug 13 15:43:04 UTC 2021) 2021-08-13 15:43:04 +00:00
Aronai SieyesandGitHub d14cd7fd46 Merge pull request #11396 from KillianKirilenko/kk-adminships 
Fix Salamanders and Wall-lockers
 2021-08-13 11:40:15 -04:00
Aronai SieyesandGitHub 44748560b6 Merge pull request #11398 from VOREStation/Arokha/przy 
Przy creations port from Chompers
 2021-08-13 11:40:04 -04:00
Aronai SieyesandGitHub 8662f320d9 Merge pull request #11399 from VOREStation/Arokha/dbreset 
Add proc to just reset database connections
 2021-08-13 11:39:55 -04:00
Ghost ActualandGitHub d963833121 Orange Line Upgrade (#11391) 
* Base Commit

* Secondary Commit

* Small Fix

* (Hopefully) Final Commit
 2021-08-13 11:39:46 -04:00
Ghost ActualandGitHub 4a2211ba08 Fancy Lifeboats (#11392) 
* Base Commit

* Small Fix

* Small Change

* Small Fix

* Small Fix
 2021-08-13 11:38:26 -04:00
Ghost ActualandGitHub 257f18b7ed Virology Revamp (#11384) 
* Base Commit

* The Manual

* Small Fix

Overlay issue discovered while testing

* Small Fix

* Small Fix

Forgot the Virgo effects in the book
 2021-08-13 11:37:41 -04:00
Aronai Sieyes 2833e089fe Add old sprite as choice 2021-08-13 11:10:57 -04:00
Aronai Sieyes a86c09ddb2 Add proc to just reset database connections 2021-08-13 11:07:36 -04:00
Aronai Sieyes 2488cce1b3 Przy creations port from Chompers 2021-08-13 01:10:33 -04:00
Killian 4b32da920f fix salamanders and wall-lockers 2021-08-12 20:29:34 +01:00
NovacatandGitHub 486a4f33b8 Merge pull request #11387 from Heroman3003/dupefix 
Fixes infinite material duplication in R&D
 2021-08-10 22:50:59 -04:00
Heroman f56040f7fa Linter calming pill 2021-08-11 11:18:09 +10:00
Aronai SieyesandGitHub 6d5471ec18 Merge pull request #11385 from Very-Soft/maintpredintro 
Adds extra text to maint pred and morph spawns
 2021-08-10 19:11:22 -04:00
Heroman 9a690a41df Fixes in split instead of input 2021-08-11 07:17:21 +10:00
Heroman face394b62 Fixes infinite material duplication in R&D 2021-08-11 06:57:48 +10:00
VerySoft 895a0574d5 Adds extra text to maint pred and morph spawns 
What's there doesn't really give any hints about what's allowed or expected, so, I added some, since there's been some understandable misunderstandings.
 2021-08-10 06:38:33 -04:00
Aronai Sieyes 826976ea14 Tweak quad HUD icons alignment 2021-08-09 18:33:48 -04:00
NovacatandGitHub 622c606046 Merge pull request #11379 from Heroman3003/wirefix 
Fixes missing wire by the cryo
 2021-08-09 08:15:29 -04:00
Heroman f0ae85a048 Update tether-03-surface3.dmm 2021-08-09 21:38:23 +10:00
Aronai SieyesandGitHub 1664cd1a58 Merge pull request #11375 from VOREStation/Arokha/shipnom3 
Ship eating skybox and emotes tweak
 2021-08-09 01:06:24 -04:00
Aronai SieyesandGitHub 77def9ca61 Merge pull request #11376 from Hatterhat/nondep-jackets 
non-departmental jackets
 2021-08-09 00:59:09 -04:00
Aronai SieyesandGitHub 7a825685df Merge pull request #11377 from Detective-Google/tram2 
re-adds wallflower space to the tram
 2021-08-09 00:58:39 -04:00
Aronai Sieyes f74693cd67 Custom emotes work too 2021-08-09 00:56:35 -04:00
Hatterhat 5e2d9d8c67 huh 2021-08-08 23:31:47 -05:00
Detective Google 69b0c42527 re-adds wallflower space to the tram 2021-08-08 23:27:25 -05:00
Hatterhat 7ad08b7b12 single point of failure 2021-08-08 23:07:56 -05:00
Hatterhat 974f6970a8 woo yea grey blue jackets 2021-08-08 23:02:22 -05:00
Aronai Sieyes 1b9e5554b5 Force skybox rebuild when ship eaten 2021-08-09 00:01:33 -04:00
Aronai SieyesandGitHub f25b1a543d Merge pull request #11373 from VOREStation/Arokha/shipnom2 
Forgot DME change for ship eating
 2021-08-08 23:41:41 -04:00
Aronai SieyesandGitHub 00f4adbe5a Merge pull request #11372 from VOREStation/Fixes/11369 
Fixes #11369
 2021-08-08 23:40:49 -04:00
Aronai Sieyes 82586875c9 And another thing 2021-08-08 23:33:09 -04:00
Aronai Sieyes 824ade0044 Forgot DME change for ship eating 2021-08-08 23:32:10 -04:00
Aronai Sieyes 1d6ca34b92 Fixes #11369 2021-08-08 23:31:15 -04:00
Aronai SieyesandGitHub dc0ee9c4d8 Merge pull request #11370 from VOREStation/Arokha/shipnom 
Allows you to eat spaceships
 2021-08-08 23:28:29 -04:00
Aronai SieyesandGitHub ebbcf5d6f3 Merge pull request #11368 from VOREStation/Arokha/closetanim 
Port of monster860's animated doors to Bay closets
 2021-08-08 23:28:20 -04:00
Aronai SieyesandGitHub 33e724d099 Merge pull request #11367 from Heroman3003/eue-fix 
Fimxes shadekin eyecolors displaying wonkily
 2021-08-08 23:28:08 -04:00