cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-31 07:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,548 Commits 9 Branches 26 Tags
e559c1b20ca53e021d076000ca6784c1bb2f496c
Commit Graph
55548 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ShadowLarkens e559c1b20c Theoretically make nanomaps work via PR 2020-11-26 05:37:23 -08:00
NovacatandGitHub ac9db68bc2 Merge pull request #9362 from ShadowLarkens/patch-1 
Prevent cyclic neighbor references in spreading plants
 2020-11-25 16:49:52 -05:00
ShadowLarkensandGitHub 9a9f0fa9e8 Prevent cyclic neighbor references in spreading plants 
These are kind of a nightmare to GC regardless, but this should at least help prevent hard del hell
 2020-11-25 13:27:25 -08:00
NovacatandGitHub fb3a2b5e53 Merge pull request #9361 from KillianKirilenko/kk-ships 
ERT Ship Cleanup
 2020-11-25 13:41:14 -05:00
Killian 6270a77696 ERT Ship Cleanup 2020-11-25 17:56:09 +00:00
NovacatandGitHub 0ef546e36f Merge pull request #9359 from Very-Soft/littletweaks 
Small tweaks
 2020-11-25 00:55:39 -05:00
VerySoft 51c2aa48ab remove window from armory 2020-11-24 22:28:02 -05:00
VerySoft 8f754ae686 electrifies some sec windows 2020-11-24 21:08:42 -05:00
VerySoft d46b6b444b mapmerge 2020-11-24 20:45:25 -05:00
VerySoft 451b7e32ee Adjusts a light and fixxes armory access buttons 2020-11-24 20:42:29 -05:00
VerySoft b214115742 adds cryox beakers to surfmed 2020-11-24 17:42:52 -05:00
VerySoft 4d4ad3f57e fix some medical areas 2020-11-24 16:04:06 -05:00
NanoMap Generation 04465ba11d NanoMap Auto-Update (Tue Nov 24 19:00:33 UTC 2020) 2020-11-24 19:00:33 +00:00
Aronai SieyesandGitHub 0c5809c51f Merge pull request #9337 from ShadowLarkens/github_actions 
Move away from Travis CI to GitHub Actions
 2020-11-24 13:59:50 -05:00
ShadowLarkens bd2f4e99d3 Install the right version of libssl 2020-11-24 10:39:09 -08:00
ShadowLarkens 5b19eec130 Readd rust_g debugging command 2020-11-24 10:32:10 -08:00
ShadowLarkens d3044c8739 Merge remote-tracking branch 'upstream/master' into github_actions 2020-11-24 09:56:38 -08:00
VerySoft b24d881cd7 medical lobby fiddling 2020-11-24 12:50:38 -05:00
VerySoft 465fd4fc8d changes chem's front desk tables to be less awkward 2020-11-24 12:30:25 -05:00
VerySoft 4bfe33877e super important critical fix 
fixxes a floor marking in security
 2020-11-24 12:27:57 -05:00
VerySoft 82cbcd1dcf Small tweaks 
Adds a bioproduct dispenser to surfchem, rearranges a lightswitch and a fire alarmm, changes the orientation of a shower
 2020-11-24 12:21:47 -05:00
NovacatandGitHub 8c95c9351e Merge pull request #9356 from Very-Soft/surfacetweaks 
Fixxes some wires and tubes
 2020-11-24 11:03:14 -05:00
NovacatandGitHub 4d11387fb3 Merge pull request #9358 from VOREStation/upstream-merge-7764 
[MIRROR] fixes #7763
 2020-11-24 11:02:51 -05:00
VirgoBot f38d1f7960 fixes #7763 2020-11-24 05:18:21 -05:00
SubberTheFabulousandVirgoBot 25431d1702 fixes #7763 (#7764) 
* updates VRDen.dmm

* updates VRDen.dmm
 2020-11-24 05:18:21 -05:00
VerySoft 07fa39c827 adds a light 2020-11-24 02:51:23 -05:00
VerySoft 7cbd4cd5e1 adds sinks to the surface ORs 2020-11-23 23:57:18 -05:00
VerySoft dfbf28d66f further fixxes and fiddlings 2020-11-23 22:41:55 -05:00
NovacatandGitHub 5fb3da7fc2 Merge pull request #9357 from VOREStation/upstream-merge-7745 
[MIRROR] Adds one (1) PoI
 2020-11-23 22:33:43 -05:00
NovacatandGitHub 31be042e27 Merge pull request #9355 from VOREStation/upstream-merge-7758 
[MIRROR] Map Fixes
 2020-11-23 22:33:25 -05:00
VirgoBot bfdbe5709b Adds one (1) PoI 2020-11-23 21:54:41 -05:00
SubberTheFabulousandVirgoBot 78a0973208 Adds one (1) PoI (#7745) 
* adds PoI

* Update plains_areas.dm

* adds PoI
 2020-11-23 21:54:41 -05:00
ZekeSulastinandVirgoBot fb905dae56 Map Fixes 2020-11-23 21:53:27 -05:00
VerySoft 9304105360 Fixxes some wires and tubes 2020-11-23 21:52:36 -05:00
NovacatandGitHub 67fb08e6e2 Merge pull request #9335 from KasparoVy/damn-son-whered-i-find-this 
Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
 2020-11-23 19:54:17 -05:00
NovacatandGitHub 33625a0954 Merge pull request #9340 from VOREStation/compatible-rust-g 
Update librust_g.so with an Ubuntu 16.04 compatible version
 2020-11-23 19:53:59 -05:00
NovacatandGitHub 32936c4657 Merge pull request #9351 from Very-Soft/stagefiddling 
adjusts stage plane
 2020-11-23 19:38:07 -05:00
VerySoft 847675583a adjusts stage layer 2020-11-23 17:57:49 -05:00
NovacatandGitHub 80ddfd23be Merge pull request #9349 from Novacat/nova-basicfixes 
More ship and turret fixes
 2020-11-23 17:18:38 -05:00
Unknown b1f33868ed Deathsquad support 2020-11-23 17:01:38 -05:00
Unknown 661d1ecc3c More ship and turret fixes 
- Nerfs the Syndicate and ERT ships to just use regular turrets
- Fixes a bug with the ERT ship where a room was not getting power
 2020-11-23 16:11:55 -05:00
NovacatandGitHub 9222fe6488 Merge pull request #9348 from Very-Soft/spellcheckwoofs 
Spellcheck the tummy text
 2020-11-23 13:33:02 -05:00
VerySoft 7008be7083 Spellcheck the tummy text 
Thanks Xander <3
 2020-11-23 12:50:09 -05:00
NovacatandGitHub 3cf44adb7c Merge pull request #9346 from ShadowLarkens/patch-1 
Fix #9345
 2020-11-23 10:21:54 -05:00
NovacatandGitHub 8ca5b51ca3 Merge pull request #9344 from ShadowLarkens/make_minimaps_work 
Nanomaps actually generate correctly now
 2020-11-23 10:05:06 -05:00
ShadowLarkensandGitHub 861bde64d0 Fix #9345 
Fixes #9345
 2020-11-23 07:03:07 -08:00
ShadowLarkens f76df71315 Nanomaps actually generate correctly now 2020-11-23 04:55:27 -08:00
ShadowLarkens f7fffdff9b Get rid of Nano tests 2020-11-23 04:45:23 -08:00
NovacatandGitHub 75bebd8a59 Merge pull request #9339 from VOREStation/Verkister-patch-5 
Fixes digested PDAs dropping IDs on the floor
 2020-11-22 23:55:26 -05:00
NovacatandGitHub d614701e6b Merge pull request #9342 from Shadow-Quill/IDRestoreEarlyReturn 
Removes prompt for ID restoration if no ID
 2020-11-22 23:54:57 -05:00