Commit Graph
1328 Commits
Author SHA1 Message Date
izac112 153c3abf2e Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-26 03:37:23 +01:00
DrathekandGitHub 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 19e46d19b2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-17 01:06:24 +01:00
Selis d99321bfdf Cleaning up defines 2024-02-10 16:44:44 +01:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
KashargulandGitHub 6669d1ffa2 remove drone set 2024-01-28 06:08:21 +01:00
KashargulandGitHub 5fd82d1b22 Merge branch 'VOREStation:master' into robotLaws 2024-01-28 04:57:02 +01:00
KashargulandGitHub d006fc7ae5 more law boards datums 2024-01-28 04:36:33 +01:00
KashargulandGitHub d3b0c1ebe6 robot upgrade overhaul 2024-01-27 13:29:19 +01:00
izac112 1c2d4da6bd Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update 2024-01-22 05:18:14 +01:00
KashargulandGitHub 4303f7e141 small qol 2024-01-19 21:41:54 +01:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
Killian b61550661d protean components and hardsuit supply category 2023-12-12 09:12:58 +00:00
Heroman3003andGitHub f1f764f36f Merge pull request #15545 from KillianKirilenko/kk-mini1
Protean Reconstitutor
2023-12-03 11:08:56 +10:00
KashargulandGitHub 978aa5afca RD Console DesignDisk Fix 2023-12-02 22:53:14 +01:00
Killian ce93d40c1c protean reconstitutor
construction, components, and upgrades
2023-12-01 10:54:19 +00:00
izac112 5052f6f672 Merge branch 'release' of https://github.com/VOREStation/VOREStation; branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2023-11-28 16:48:53 +01:00
KashargulandGitHub d6b2f4c3dd Added a module to allow medihounds and securityhounds to ingest items upon installation. Does not interfer with the maximum 1 person limit. Allows a maximum of 4 items to be ingested with both modules (capability and capacity) insalled. 2023-11-10 20:10:52 +01:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
SatinIsle 57499402c0 Bluespace Collars
Added two new bluespace collars. They both control the size of the wearer via signalers. The first one allows you to select the size by clicking on it, and is locked to a code and frequency. The second is made by modifying the first, by adding a signaler to it. This one does not allow you to set the size or code on it, and is only locked to frequency. The size you are resized to is determined by the code that is sent from a signaler.
Adds these to various lists, such as trader items, RnD and maint loot.

Also added a new "random bluespace item" random item spawner for mapping use. It is currently not mapped in anywhere.
2023-09-06 16:24:28 +01:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Heroman3003andGitHub ba46363f1e Merge pull request #15097 from MisterGrimm/miscfixesandchanges
Moves BL-3/P design to correct folder
2023-07-02 07:48:19 +10:00
Sym 335f0f099b Moves BL-3/P design to correct folder
Mech design was in the micro mechfab_designs_vr folder, which is it's incorrect location.
2023-07-01 17:32:13 -04:00
izac112 ff7df50a7e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-21 19:03:35 +02:00
Runa Dacino 61ef3c1f35 fix(repath): Fixes ore satchels from picking up BS crystals
* Repaths Bluespace crystals from obj/item/weapon/ore subtype to obj/item/weapon subtype.
* Adjusts all code references appropriately

I've looked as far as VScode can let me, and I could not find any actual implementation, reference of mechanic that looked like it was using the /ore/ subtype's special mechanics.

Furthermore, I looked in mine_turfs and mineral outcrops codes to see if bluespace crystals were ever treated as an ore/mineral. Once more, I found nothing there either.

Beyond this, I asked cody if they'd ever encountered BS crystals as part of the xenoarch procedure and they reported no

Therefore, I've come to the conclusion that there is absolutely no reason for bluespace crystals to be an ore subtype. Doing this does lose their ability to be sampled by a core sampler but... There was no turf that'd spawn BS crystals (and ore sampler requires it to have been made by a mineral turf).

As such! I repathed it and all references to it and its artificial subtype.

Testing shows that all techs involving BScrystals function as expected (telepad, telesci computer, quantum pad), with deconstruction and construction alike and their expected functionalities.
2023-06-20 17:04:01 +02:00
ItsSelis 10d2178516 More 515 Compatibility 2023-06-05 19:29:40 +02:00
izac112 4cc81d7c73 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-03-19 22:24:48 +01:00
Heroman3003andGitHub 00dac3b669 Fixes recipe id 2023-03-17 07:58:10 +10:00
Heroman3003andGitHub d88c8acc4d Fixes sort strings 2023-03-16 17:45:13 +10:00
Heroman fbf6bf41c2 Various weather and firework related cleanup and adjustments 2023-03-16 17:07:56 +10:00
Heroman3003andGitHub 0be53d50f6 Merge pull request #14618 from MisterGrimm/GA-X
Adds a new mech weapon, the GA-X Experimental Gamma Laser
2023-03-15 07:14:02 +10:00
Seris02andVirgoBot dd1e58acc7 cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else 2023-03-08 23:26:14 -05:00
Sym 93a491a203 Adds GA-X
Adds the GA-X experimental gamma laser.
2023-03-06 16:28:58 -05:00
izac112 53f54d78e6 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-03 21:12:41 +01:00
C.LandGitHub 5e1bc2fcc1 Update medical.dm 2022-12-26 15:39:56 -05:00
C.LandGitHub d499d6dd37 Makes advanced health analyzers creatable via R&D 2022-12-26 14:59:00 -05:00
Heroman3003andGitHub 847e53de29 Quick recipe fix 2022-12-25 21:28:08 +10:00
Heroman 64149a5d5b Adds fireworks and their launchers 2022-12-25 21:15:33 +10:00
izac112 ff37a7ac7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-11-02 13:33:47 +01:00
Heroman3003andGitHub 582df4c429 Fix 2022-10-29 17:24:18 +10:00
CerebulonandVirgoBot eba08a1c71 Snowmobiles and Quadhancements V2 2022-10-28 19:45:03 -04:00
izac112 dc36fe9b8f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-10-16 22:52:41 +02:00
Heroman cbe0765e12 Fixes a few bugs here and there 2022-10-09 06:24:56 +10:00
NovacatandGitHub 1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
MistakeNot4892 d717a4b50a Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298 2022-08-25 14:26:20 +10:00
izac112 cf41cd724c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-08-18 18:57:14 +02:00
C.L 774e26da52 Makes the reverse-mouseray able to be made via research.
Since TFs can happen and if the ray medical has gets lost by some means or something a backup would be needed.

This allows it to be created in game without having to ahelp for a replacement.
2022-08-17 14:29:53 -04:00
izac112 8f96195fdb Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-23 13:40:54 +02:00
Heroman 8a9df3b2ea Fixes in-chat icons being broken 2022-07-20 18:55:27 +10:00