cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-19 01:58:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,351 Commits 9 Branches 26 Tags
16465b5618d8117408d2dd514b9db8bc3437d9ec
Commit Graph
17218 Commits
Author SHA1 Message Date
NovacatandGitHub 16465b5618 Merge pull request #8728 from VOREStation/upstream-merge-7466 
[MIRROR] Adds wearing cones and caution signs
 2020-08-21 13:33:08 -04:00
NovacatandGitHub a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -04:00
NovacatandGitHub 1b27dffb9d Merge pull request #8757 from VOREStation/upstream-merge-7445 
[MIRROR] FBP Internal Components
 2020-08-21 13:32:02 -04:00
Rykka 9b2e3f8e5d Fixes filepaths to be correct with the new cone types 2020-08-21 08:00:29 -04:00
VerkisterandGitHub 5c50080377 Merge pull request #8754 from VOREStation/upstream-merge-7386 
[MIRROR] Reagent Hoses
 2020-08-21 14:25:55 +03:00
VerkisterandGitHub 929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Rykka 3fdd863afb Fixes conflicts with incoming Mirror #8756, Re-enables ecigs 
At this point, ecigs have been arbitrarily disabled for who knows how long for... no idea why, honestly?

I've added the missing .dmi and re-added ecigs to the .dme, in the interest of not conflict-fixing a million problems with vending machines.

E-cigs will need to be added to loadouts manually later.
 2020-08-21 05:42:43 -04:00
ShadowLarkensandRykka 7aaa40b62c Beginnings of a global volume control system 2020-08-21 04:42:47 -04:00
NovacatandGitHub 4374731142 Merge pull request #8783 from VOREStation/upstream-merge-7522 
[MIRROR] Improve cleanbot ai slightly
 2020-08-21 01:42:29 -04:00
NovacatandGitHub 4dc293b831 Merge pull request #8784 from VOREStation/upstream-merge-7521 
[MIRROR] Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:42:13 -04:00
NovacatandGitHub 10bcf007c5 Merge pull request #8782 from VOREStation/upstream-merge-7519 
[MIRROR] Allows building plating on grass
 2020-08-21 01:41:51 -04:00
AtermoneraandVirgoBot 4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint 
Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:28:23 -04:00
AtermoneraandVirgoBot 4eb14e5a0d Merge pull request #7522 from Meghan-Rossi/cleanbotaitweak 
Improve cleanbot ai slightly
 2020-08-21 01:28:12 -04:00
AtermoneraandVirgoBot 83e9effdf7 Merge pull request #7519 from Meghan-Rossi/grassbuilding 
Allows building plating on grass
 2020-08-21 01:26:56 -04:00
AtermoneraandVirgoBot 0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix 
Fix cyborgs not being able to cook
 2020-08-21 01:25:40 -04:00
NovacatandGitHub d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat 
Adds Mech Toy Battles!
 2020-08-21 01:14:42 -04:00
NovacatandGitHub 89b0fa6b79 Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch 
Persistence Patch
 2020-08-21 01:14:04 -04:00
NovacatandGitHub eab980a15b Merge pull request #8766 from VOREStation/upstream-merge-7494 
[MIRROR] Delete some duplication in the mech drill
 2020-08-21 01:10:23 -04:00
AtermoneraandVirgoBot 3edff36a58 Merge pull request #7502 from Meghan-Rossi/ducttape 
Fix duct tape on self
 2020-08-20 22:24:43 -04:00
AtermoneraandVirgoBot 3c52b46be9 Merge pull request #7494 from lbnesquik/Kot-drill-zeven-tweak 
Delete some duplication in the mech drill
 2020-08-20 22:19:11 -04:00
MechoidandVirgoBot 170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
AtermoneraandVirgoBot 1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
MechoidandVirgoBot 496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
NovacatandGitHub e66cf2eb57 Merge pull request #8741 from ShadowLarkens/tgui_exploration 
TGUI exploration
 2020-08-20 18:52:52 -04:00
Meghan-Rossi 87f41b6527 Fixes not being able to relabel canisters 
Fixes https://github.com/VOREStation/VOREStation/issues/8746
 2020-08-20 17:16:04 +01:00
ShadowLarkens 02bb4637eb TGUI Point Defense Mainframe & Advanced Shield Generator 2020-08-18 20:42:59 -07:00
ShadowLarkens 61faa8057c Brig timer adjustment & camera console panning 2020-08-18 13:47:43 -07:00
ShadowLarkens 39fd76aafb TGUI Dna Scanner 2020-08-18 07:58:00 -07:00
ShadowLarkens cefe1a0b3c TGUI Brig Timer, Prisoner Management Console, and Security Records 2020-08-18 07:57:13 -07:00
NovacatandGitHub 8079ce2f0f Merge pull request #8720 from ShadowLarkens/tgui_cargo 
TGUI Cargo
 2020-08-18 09:48:13 -04:00
VerkisterandGitHub cb9d6f47e8 Merge pull request #8332 from lbnesquik/Kot-Sec-Tweak 
Grant brig access to the detective as a .vr tweak
 2020-08-18 16:08:13 +03:00
MechoidandVirgoBot ccd5993b38 Exosuit Upkeep (#7473) 
* Exosuit upkeep, lower slowdown of Durand and Gygax components, guns now slow far less.

* Time time time.

* Seeds survive. For now.
 2020-08-17 18:19:51 -04:00
listerlaandVirgoBot c63d6c5777 Adds wearing cones and caution signs (#7466) 
* Adds wearing cones and caution signs

* Fixes quarantine shuttle PoI

* Create Lorilili - janiwear.yml
 2020-08-17 12:59:40 -04:00
ShadowLarkens 5bbd5334b6 TGUI GPS & Mining Vendor & Ore Processing Console 2020-08-16 22:27:09 -07:00
ShadowLarkens aea68811f6 TGUI Request Console (and Fix TGUI verb) 2020-08-16 22:27:08 -07:00
ShadowLarkens 78d1d2e9a1 TGUI Supply Computer 2020-08-16 22:27:08 -07:00
NovacatandGitHub 005c47fa91 Merge pull request #8715 from VOREStation/upstream-merge-7451 
[MIRROR] Tweak to the washing machine.
 2020-08-17 00:25:13 -04:00
NovacatandGitHub d4289ada63 Merge pull request #8719 from VOREStation/revert-8716-upstream-merge-7426 
Revert "[MIRROR] Disable breaking fragile floor tiles with the crowbar"
 2020-08-17 00:25:00 -04:00
NovacatandGitHub f4d678f130 Merge pull request #8717 from VOREStation/upstream-merge-7515 
[MIRROR] Removes TURF_IS_FRAGILE from wooden flooring
 2020-08-17 00:05:18 -04:00
NovacatandGitHub 23d318a825 Revert "[MIRROR] Disable breaking fragile floor tiles with the crowbar" 2020-08-17 00:05:00 -04:00
NovacatandGitHub 8b8d816fa0 Merge pull request #8714 from VOREStation/upstream-merge-7490 
[MIRROR] Improves mecha strafing
 2020-08-17 00:03:39 -04:00
NovacatandGitHub f86a0e7769 Update washing_machine.dm 2020-08-17 00:02:57 -04:00
AtermoneraandVirgoBot 94e42939de Removes TURF)IS_FRAGILE from wooden flooring (#7515) 2020-08-16 23:54:08 -04:00
KatesandVirgoBot 62b52c7844 Disable breaking fragile floor tiles with the crowbar (#7426) 
* Disable breaking floor tiles with the crowbar
It's not fun, it adds nothing to the gameplay and it isn't clear what breaks and what does. I see seriously zero reasons to keep this.

* Actually make it so you can pry off tiles still.
 2020-08-16 22:51:34 -04:00
AtermoneraandVirgoBot d0b679fd88 Tweak to the washing machine. 2020-08-16 22:41:04 -04:00
AtermoneraandVirgoBot 7d6e90debf Merge pull request #7490 from lbnesquik/Kot-mech-854th-tweak 
Improves mecha strafing
 2020-08-16 22:39:49 -04:00
VerkisterandGitHub 5b29b10db2 Merge pull request #8704 from VictorZisthus/VictorZisthus/Maptweaks 
Victor zisthus/maptweaks
 2020-08-16 21:16:04 +03:00
ShadowLarkens f2f2f57777 Canister drop sound 2020-08-16 07:44:20 -07:00
Rykka b586bb97e8 Fix Travis errors, define mapload as Initialize() argument 2020-08-16 10:08:51 -04:00
Rykka ad6870c78d Persistence Patch 
- Fixes Paper and font tags stacking across rounds, as shown in: ![](https://cdn.discordapp.com/attachments/187013248309002240/741937939382141000/164fdd3a37fb22f18dfa9b5c431ffc04.png)

- Fixes Graffiti being persistent for over 50 rounds (10+ days)
- Sets Trash to be persistent for 4 rounds instead of 5
- Fixes Persistence being always-on because of if("persistence_enabled") config.persistence_enabled = 1. As explained: 
> it's on by default, which means config.txt will be read and if it's not there it stays at 1. If it is there,it gets set to 1. There is no way to disable it

- Adds config options to enable/disable **Persistence for Maploaded objects**, as well as a verb to toggle such.
- Adds Persistence to config.

Currently IGNORE_MAPLOAD for Persistance is **Disabled.**
Maploaded objects/dirt/etc will be saved by persistence, preserving current behavior.
 2020-08-16 09:48:46 -04:00