cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-06-12 08:55:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,690 Commits 9 Branches 26 Tags
eb830751eebefff76aa6478b4cc177617d31a3e8
Commit Graph

8650 Commits

Author SHA1 Message Date
Novacat 4b46195b95 Merge pull request #8951 from VOREStation/upstream-merge-7602 
[MIRROR] Fix jetpack ion trail
 2020-09-01 08:02:42 -04:00
Novacat dba5a14b5f Merge pull request #8952 from Heroman3003/constructible-vorelaws 
Constructible vorelaws
 2020-09-01 08:02:26 -04:00
Heroman 732448d389 Fixes indent errors 2020-09-01 20:37:56 +10:00
Heroman3003 045be423b3 .dm 2020-09-01 16:27:42 +10:00
Heroman3003 00913ff339 Adds boards for AI vore laws 2020-09-01 16:26:39 +10:00
Novacat c06ccac8a5 Merge pull request #8935 from Cyantime/jetpackfuel 
Jetpack cleanup, don't use fuel when unneeded
 2020-09-01 01:05:04 -04:00
Atermonera 3daa38aade Merge pull request #7602 from Cyantime/patch-2 
Fix jetpack ion trail
 2020-09-01 01:05:03 -04:00
Cyantime 99009e6266 Jetpack cleanup, don't use fuel when unneeded 2020-08-31 21:13:04 -04:00
Atermonera 87221b5e66 Adds hailer gas (face) masks. 2020-08-31 18:10:57 -04:00
Cerebulon 7c57c7c0bd Vendor enhancement fixes (#7577) 
* Vendor enhancement fixes

* skrellsnax trash, tuna name
 2020-08-30 02:49:00 -04:00
Heroman ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
Unknown 10ca73bc6e Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576 2020-08-28 13:30:54 -04:00
Novacat 28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Novacat bac13fc41d Merge pull request #8858 from VOREStation/upstream-merge-7551 
[MIRROR] Improves Portal Documentation for New Mappers unfamiliar with DIR
 2020-08-28 13:04:56 -04:00
Novacat bd4d0e78d4 Merge pull request #8833 from VOREStation/upstream-merge-7456 
[MIRROR] The great Aurora shoe heist
 2020-08-28 13:04:33 -04:00
Novacat 5c83c09e52 Update portal.dm 2020-08-28 12:50:18 -04:00
Unknown abef279ba7 compatibility fixes 2020-08-28 12:49:11 -04:00
Novacat f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00
Atermonera 57bc515c04 Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases 2020-08-27 22:28:46 -04:00
Atermonera 4acd8a7a87 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes 
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
 2020-08-27 21:45:33 -04:00
Atermonera 21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Atermonera 96116057c0 Improves Portal Documentation for New Mappers unfamiliar with DIR 2020-08-27 19:47:56 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Rykka cf2a964018 Adds Rabbit to Predcrate, someone else can make a smaller crate 
Also fixes rabbit body colors
 2020-08-26 22:23:45 -04:00
Atermonera ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -04:00
Novacat a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2 
Explorer/Pathfinder Belts
 2020-08-25 17:15:14 -04:00
ShadowLarkens 097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Rykka c71dba5cae Converts Step_triggers to Portals! 
Implements Portal Functionality to replace the older step_triggers!

Z-level transitions are now 99.9% seamless!

It's self-explanatory, images below in editor:
![](https://i.imgur.com/EBr9mnN.png)
![](https://i.imgur.com/lP0UQxT.png)
![](https://i.imgur.com/c6VX1EC.png)
![](https://i.imgur.com/dfqDz75.png)
![](https://i.imgur.com/pUNVmBG.png)

In-game Version:
To Surface Mining:
![](https://i.imgur.com/aoJIwps.png)
![](https://i.imgur.com/nqVCYV9.png)
To Solars:
![](https://i.imgur.com/FRb6ZKB.png)
To Plains/Wilderness:
![](https://i.imgur.com/Y8kf40k.png)
 2020-08-22 20:36:49 -04:00
Novacat 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
Novacat a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -04:00
Novacat 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
Verkister 929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Novacat 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
Atermonera 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
Atermonera 0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix 
Fix cyborgs not being able to cook
 2020-08-21 01:25:40 -04:00
Novacat d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat 
Adds Mech Toy Battles!
 2020-08-21 01:14:42 -04:00
Novacat 89b0fa6b79 Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch 
Persistence Patch
 2020-08-21 01:14:04 -04:00
Atermonera 3edff36a58 Merge pull request #7502 from Meghan-Rossi/ducttape 
Fix duct tape on self
 2020-08-20 22:24:43 -04:00
Mechoid 170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
Atermonera 1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
Mechoid 496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
listerla 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
Verkister 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
Victor Zisthus 69ac92250a Access Overhaul + Minor Map Tweaks 
Overhauled most doors with new access codes as a result of the code fixes intended to keep departments as pure as possible.

Other changes marked below.

(77,111,1) Added Intercom
(77,110,1) Changed Door Sprite
(43,60,1) Added Atmos Access
(105,32,1) Tider's greetings...
(100,38,2) Set starting pressure to match other tanks.
 2020-08-15 18:26:43 -04:00
Rykka 5acb88413c Rename toy/mech to toy/mecha to match mecha code. 2020-08-12 20:08:05 -04:00