izac112
153c3abf2e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-26 03:37:23 +01:00
Drathek and GitHub
7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.
* Attempt to normalize example.yml (and another file I guess)
* Try again
2024-02-20 11:28:51 +01:00
izac112
9402b12322
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-08 18:19:52 +01:00
izac112
1c2d4da6bd
Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update
2024-01-22 05:18:14 +01:00
Kashargul
e4b62dfa35
remove static chat colour tags
2024-01-21 12:34:53 +01:00
Kashargul and GitHub
98b8589181
fix runtime and dupe
2024-01-18 23:58:59 +01:00
izac112
a17d96cb92
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-10-30 11:24:00 +01:00
Heroman
b255b1a8a3
Fixes belts and pouches not being able to hold power tools
2023-10-02 15:54:41 +10:00
Heroman
9a94306585
Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one
2023-10-01 09:34:43 +10:00
Runa Dacino
1b23ff5cdc
tweak: Replaces "Iron" pill bottle with blood regen pill bottle
...
Replaces instances of "iron" pill bottle with the new blood regen pill bottle in containers and maps that are either NanoTrasen or Zorren related. Keeps iron bottles in other maps (mostly specific away mission rewards)
add: Adds Copper pills, Blood regen pill bottles
30 u copper reagent per copper pill. Blood regen contains 9 iron, 5 copper pills now that zorren need copper for treatment
2023-09-10 16:45:26 +02:00
izac112
4088f40cc9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-08-24 18:27:07 +02:00
Heroman
9435db8c69
Feature completion for Dogborg Removal
2023-08-09 19:40:36 +10:00
Heroman
eade7ffc26
Adds altevian NPCs for event use
2023-07-14 17:38:02 +10:00
izac112
ff7df50a7e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-06-21 19:03:35 +02:00
Heroman3003 and GitHub
860fad8a75
Merge pull request #15043 from ItsSelis/spell-fixes-v2
...
Spell Fixes
2023-06-19 14:39:41 +10:00
Selis
271ff9408f
Spell Fixes
2023-06-18 12:47:36 +02:00
Youtubeboy139
c8075aa901
New Belts and Accessories
2023-06-17 16:31:45 -04:00
Heroman3003 and GitHub
734171f96b
Merge pull request #14961 from Youtubeboy139/Lighters_&_cigs
...
"Hey bud, need a light?"
2023-06-10 08:42:47 +10:00
ItsSelis
10d2178516
More 515 Compatibility
2023-06-05 19:29:40 +02:00
Youtubeboy139
bd829ad563
Lighters and Cigs sprite revivals
2023-06-03 21:21:04 -04:00
Youtubeboy139
d4d86a2c31
Hydroponics Fix
2023-06-03 15:00:06 -04:00
izac112
9cedb2ec47
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-06-03 19:53:45 +02:00
Heroman3003 and GitHub
b22b9e6e48
Merge pull request #14936 from ItsSelis/selis-weakrefs
...
Little Weakref Refactor
2023-06-03 19:21:17 +10:00
ItsSelis
0680645556
Weakref refactor
2023-06-01 20:31:54 +02:00
Youtubeboy139
f41ff986ff
New Hydroponic Items/Sprites
2023-05-31 22:12:32 -04:00
Youtubeboy139
e25ce95254
Base Commit
2023-05-27 15:57:52 -04:00
Youtubeboy139
9364ea4f2e
Base Commit
2023-05-25 20:35:35 -04:00
Heroman
d5c0c30cc2
Adds Aria's medal
2023-05-25 10:43:12 +10:00
izac112
4cc81d7c73
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-03-19 22:24:48 +01:00
Heroman3003 and GitHub
32e97ebda2
Update mre.dm
2023-03-14 17:59:20 +10:00
Atermonera and VirgoBot
9987e78f5a
Fixes a raunchy typo
2023-03-14 03:47:24 -04:00
Heroman3003 and GitHub
21acee71bf
Merge pull request #14551 from VOREStation/upstream-merge-8962
...
[MIRROR] /tg/ era language pass
2023-03-13 15:23:34 +10:00
Heroman3003 and GitHub
7a5c03bb65
Update toolbox.dm
2023-03-13 15:04:26 +10:00
Heroman
a7ac53831f
Fixes MRE unpacking and Intercom Convo
2023-03-12 06:41:32 +10:00
Cerebulon and VirgoBot
19715ab471
/tg/ era language pass
2023-02-25 02:34:24 -05:00
izac112
f61e9a6a39
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-29 21:52:44 +01:00
Killian
a403fa06f9
[TILT WARNING]
...
Now a toggle
2023-01-20 13:18:33 +00:00
Unknown
be255c4b4f
Uplink and Pouch Tweaks
...
- Adds capture crystals to uplink
- Swaps bluespace pouch for normal pouches in uplink
- Small pouches are slightly less cumbersome, large pouches slightly more cumbersome
- Reduced storage of bluespace pouches to be consistent with bags of holding
2023-01-14 22:42:16 -05:00
izac112
904e960b04
Exploration is staying on yawn
2023-01-03 21:13:11 +01:00
izac112
53f54d78e6
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-03 21:12:41 +01:00
Unknown
a2b74cf590
Miscellaneous tweaks
...
- Swaps advanced health analyzers for phasic ones in some event zones (mostly ERT/CC)
- Removes the listening_level var from preset relays
2022-12-30 15:29:28 -05:00
VerySoft
415742c4f0
c:
2022-12-21 04:34:05 -05:00
izac112
2ef553df70
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-12-02 16:33:11 +01:00
VerySoft
5e4770e3a5
Ticket printer in belt
...
belt
2022-11-21 20:45:10 -05:00
izac112
ff37a7ac7b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-11-02 13:33:47 +01:00
Heroman3003 and GitHub
bc4b9ce9dc
Fix
2022-10-29 17:16:00 +10:00
Heroman3003 and GitHub
107b75b050
Conflict resolution
2022-10-29 17:11:37 +10:00
Atermonera and VirgoBot
e70d5b7986
Adds flasks to the forensic belt allowed items
2022-10-28 19:41:39 -04:00
Pandora and GitHub
82ec1cc013
Oops, all indents
2022-10-18 19:25:49 +01:00
Pandora and GitHub
e550958411
Update belt.dm
2022-10-18 19:17:07 +01:00
izac112