8cc3e87f1b
Update scannable fabricator pathname
2020-09-26 15:13:00 -07:00
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
a8d4104fea
added tesh plush ears, fixed PEili not apearing on head.
2020-09-20 17:23:14 -05:00
c55ea87e94
Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions
2020-09-19 03:03:11 -05:00
71266ace1e
added new plushies to drop lists
2020-09-19 03:03:09 -05:00
d389a57133
Merge branch 'master' into kbraid.edit/additions
2020-09-16 13:38:00 +02:00
565bb2a522
fixed a line
2020-09-15 19:35:29 -05:00
55d8523787
teshari alternate placement slots (plush only)
...
was only able to figure out how to do it for the plushie. someone else will need to do the living tesh.
2020-09-15 19:34:40 -05:00
4e7b4df749
Merge branch 'master' into izac
2020-09-14 14:11:02 +02:00
5fbb0b16b9
Voreupdate
2020-09-13 15:06:19 +02:00
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
e463b40a20
fix
2020-09-11 16:53:17 -05:00
8b0a2a285d
tesh plushes can be held, they can be worn!
2020-09-11 14:56:56 -05:00
eb19c52598
Welderbomb!
2020-09-11 14:03:47 -05:00
b8319062fb
Better sprites, more sprites!
...
Do not Merge first!
2020-09-11 04:22:47 -05:00
ead7d70d97
a letter
2020-09-10 03:27:02 -05:00
5e1b471925
A gift for Jeanne and an upgrade for Strix
2020-09-09 19:43:50 -05:00
09768ea90c
Confetti cannon
...
-Adds confetti cannon
-Adds grenade object needed to make the cannon work
-Makes the cannon printable at RnD
2020-09-05 07:15:49 -04:00
7c57c7c0bd
Vendor enhancement fixes ( #7577 )
...
* Vendor enhancement fixes
* skrellsnax trash, tuna name
2020-08-30 02:49:00 -04:00
ffdd8de3ce
Site Management lookover for _vr stuff
2020-08-29 05:22:52 +10:00
10ca73bc6e
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576
2020-08-28 13:30:54 -04:00
28c19ee066
Merge pull request #8868 from VOREStation/upstream-merge-7571
...
[MIRROR] Colony Director -> Site Manager
2020-08-28 13:17:58 -04:00
57bc515c04
Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases
2020-08-27 22:28:46 -04:00
21c1b12ef1
Colony Director -> Site Manager
2020-08-27 20:43:04 -04:00
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
a69e94f948
Merge pull request #8519 from KillianKirilenko/kk-misc2
...
Explorer/Pathfinder Belts
2020-08-25 17:15:14 -04:00
097d4fa283
TGUI Research
2020-08-25 13:30:47 -07:00
e08fef0e70
fixeeees
2020-08-22 20:07:52 +02:00
48af4c881c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-22 20:07:45 +02:00
a6efe9acbb
Merge pull request #8756 from VOREStation/upstream-merge-7449
...
[MIRROR] Flavour Enhancement: Vending
2020-08-21 13:32:37 -04:00
929ce6c728
Merge branch 'master' into upstream-merge-7386
2020-08-21 14:12:26 +03:00
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
d63f0b2c3e
Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat
...
Adds Mech Toy Battles!
2020-08-21 01:14:42 -04:00
89b0fa6b79
Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch
...
Persistence Patch
2020-08-21 01:14:04 -04:00
3edff36a58
Merge pull request #7502 from Meghan-Rossi/ducttape
...
Fix duct tape on self
2020-08-20 22:24:43 -04:00
1e9e8c2c60
Flavour Enhancement: Vending
2020-08-20 21:25:31 -04:00
496322f4f1
Reagent Hoses
2020-08-20 21:24:06 -04:00
ab4e02dddb
hopefully solves POI error
2020-08-18 15:02:18 -03:00
0d69570d49
makes cryogaia outside able to support new areas
2020-08-18 02:52:25 -03:00
c33314eadf
Kassc's death lego
2020-08-17 10:05:47 -04:00
74d84d2cff
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-17 09:44:00 +02:00
5bbd5334b6
TGUI GPS & Mining Vendor & Ore Processing Console
2020-08-16 22:27:09 -07:00
5b29b10db2
Merge pull request #8704 from VictorZisthus/VictorZisthus/Maptweaks
...
Victor zisthus/maptweaks
2020-08-16 21:16:04 +03:00
b586bb97e8
Fix Travis errors, define mapload as Initialize() argument
2020-08-16 10:08:51 -04:00
ad6870c78d
Persistence Patch
...
- Fixes Paper and font tags stacking across rounds, as shown in: 
- 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
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
da4f8bb470
fixes rpd sometimes having a null recipe
2020-08-14 16:08:16 -04:00
5c02633707
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore ; branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-13 20:01:22 +02:00
5acb88413c
Rename toy/mech to toy/mecha to match mecha code.
2020-08-12 20:08:05 -04:00
e4b5b8ea2d
Merge pull request #8661 from ShadowLarkens/med_pass_2
...
TGUI Medical: Second Pass
2020-08-12 20:01:12 -04:00
Razgriz
