521 Commits
Author SHA1 Message Date
izac112 0fa0bc3ed0 Fixes 2024-12-06 00:25:08 +01:00
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
izac112 a2ad915045 Device and weapon 2024-12-01 00:56:26 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
2c11b12814 Headset Refactor and Selection (#16568)
* headset refactor and selection

* Update headset.dm

formatting

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/_helpers/global_lists.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2024-11-06 18:49:11 +01:00
Kashargul a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Guti f2d6e7c639 Damn recording tapes 2024-09-29 00:14:13 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
izac112 04de351a1e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-07-17 16:14:16 +02:00
SatinIsleandGitHub d27b00d2f5 Butterfly nets (#16088)
Added butterfly nets. These nets can be wafted across a tile, much like a fishing net, to catch butterflies (and people of scale 50% and below)! Using them on themselves either drops the contents, or if the inactive hand is empty, pulls out the contents into the free hand.
They can be crafted from cloth, found in the botanists locker, or rarely found in maintenance.
2024-07-07 20:47:09 +10:00
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 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
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Killian 64590b4f0f emergency beacon 2023-08-18 13:46:25 +01:00
izac112 9cedb2ec47 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-03 19:53:45 +02:00
Youtubeboy139 f41ff986ff New Hydroponic Items/Sprites 2023-05-31 22:12:32 -04:00
Killian 058c57a299 fix merge conflict, add dept gorkas to selectors 2023-05-25 01:03:17 +01:00
Heroman3003andGitHub df699feabc Merge branch 'master' into kk-nanofix 2023-05-25 09:55:05 +10:00
Killian 0fb46b59a3 tg clothing polish 2023-05-24 19:59:31 +01:00
Killian b06da3aa06 gorkamorka
more gorka suits
2023-05-23 17:19:59 +01:00
Detective-Google f8fb3a13f9 adds overwear + makes most of the clothing obtainable. 2023-05-19 02:06:34 +01:00
izac112 f61e9a6a39 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-29 21:52:44 +01:00
Heroman 655116c3d1 Fixes personal lockers robbing borgs of their modules 2023-01-04 15:59:46 +10: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
VerySoft 415742c4f0 c: 2022-12-21 04:34:05 -05:00
izac112 dc36fe9b8f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-10-16 22:52:41 +02:00
C.L 6eb311dc1d More changes
- Makes a special wire reader tool that the CE starts with
- Makes CE blueprints able to add charges to Engineer's blueprints.
- Makes it so CE blueprints don't have the wire legend.
- Adds Engineer's blueprints to the Engineer's lockers.
- Adds Engineer's blueprints.
- Makes it so you can't make a new area in a non 'BUILDABLE_AREA_TYPES' area without CE blueprints. (See global_lists_vr).
2022-10-01 21:04:47 -04:00
C.L b103587ec6 Replaces references to blueprints.
Old blueprints are gone now.
2022-10-01 02:04:59 -04:00
1144101012 [MIRROR] Adds job winter coats to job lockers (ABLE TO BE MERGED) (#12904)
* Adds job winter coats to job lockers

* Update hooded.dm

* Update wardrobe.dm

* Update security.dm

* Update scientist.dm

* Update medical.dm

* Update cargo.dm

* Update job_closets.dm

* Update job_closets.dm

* Update hooded.dm

Co-authored-by: Spookerton <spkrtn@pm.me>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:02:22 -04:00
izac112 8f96195fdb Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-23 13:40:54 +02:00
Heroman 9bfa59355b Adds double engi closets for SD and RP 2022-07-17 09:10:25 +10:00
izac112 71d069887c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-08 15:49:48 +02:00
PandoraandGitHub 1fec9b4bac Update security_vr.dm 2022-07-03 05:13:34 +01:00
ItsSelis bb87687017 Resolve conflicts 2022-06-18 14:57:51 +02:00
izac112 891967a990 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-06-06 15:26:15 +02:00
KetraiandVirgoBot 0937f3a381 Cooking QOL V2 2022-06-05 20:17:44 -04:00
PandoraandGitHub 4a8a2fd6a0 grrr, commas 2022-05-22 00:30:49 +01:00
PandoraandGitHub 3baf4b9453 Adjusts CE starting equipment 2022-05-21 23:14:34 +01:00
izac112 2a815d66d2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-03 16:56:15 +02:00
CaseyandGitHub 5d9f0462c1 Merge pull request #12579 from GhostActual/tg-port-5
The Grand /TG Port - Part 5
2022-04-02 23:30:27 -04:00
GhostActual ef2ef019cb Base Commit 2022-04-01 03:33:58 -04:00
GhostActual d97ffa3c16 Base Commit 2022-04-01 02:04:21 -04:00
izac112 cb17c4daf4 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-03-26 19:03:28 +01:00
GhostActual 7dced2cc17 Base Commit 2022-03-24 16:35:34 -04:00
izac112 068da2c612 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-03-22 20:15:54 +01:00
GhostActual 47b9f404f6 Base Commit
Whoops

Not supposed to be here

Idea I had in the middle of the night that wanted to add
2022-03-18 23:50:00 -04:00
izac112 74ee064587 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-03-07 16:16:38 +01:00