Commit Graph
3249 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
SatinIsle 1a9a3cafdb Size Toy Fun
This PR adds three new functions to existing size toys:

Added a new variant of the size collar that is created by using a wrench to break the crystal. This prevents the user from changing the size manually, and triggering the collar with a signal flips the wearer back and forth between a random size and their original size.

Added a new verb "Spin Size Dial" to size guns to spin the dial to a random size. Found in the object tab or on right click.

Added an alt-click effect to gradual size guns that toggles a size-trading mode. With this active, when you shrink a target you grow at the same speed, and vice versa.
2024-02-11 19:58:37 +00:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
Heroman3003andGitHub 82812ea2e6 Merge pull request #15733 from BonniePandora/Replikant
Ports various clothing items, two sets of cyberlegs & some markings
2024-02-08 03:56:39 +10:00
PastelPrinceDan 373bb64cc7 adds 1 outfit, port 1 pair of ears, fixes 2 hairs 2024-02-07 12:23:13 +00:00
BonniePandora d561f31319 Replikant stuff
Items, robolimbs & markings
2024-02-06 00:25:50 +00: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
dafsu 75e76acb2f Update miscellaneous.dm 2024-01-19 02:20:57 +03:00
Repede 0a98f39972 Event medals refactor 2023-12-30 15:18:24 -05:00
Repede 675afd5ae9 Event medal fluff items for 6 crew 2023-12-30 14:46:51 -05:00
izac112 efeccef286 fixes snowsuits
Fixes snowsuit
2023-12-24 19:08:32 +01:00
izac112 0dc10fb7a7 Moves 'icons/obj/clothing/suits_yw.dmi' to 'icons/inventory/suit/item_yw.dmi' 2023-12-24 00:24:23 +01:00
dafsu 0bf27bc4b2 code 2023-12-22 20:59:10 +03:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
PastelPrinceDan 5af5557f5e sprite fixes + edits + loadout add 2023-12-11 03:57:40 +00:00
PastelPrinceDan 0065dccc1b clothes and hair and even a tail oh wow 2023-12-06 07:53:18 +00:00
Heroman3003andGitHub 864248da9b Merge pull request #15424 from KillianKirilenko/kk-laserdome
Redgate Laserdome
2023-12-03 11:07:22 +10: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
Killian 2cc25e3eca Merge remote-tracking branch 'upstream/master' into kk-leggies 2023-11-01 22:32:31 +00:00
Killian 3157df5072 Update clothing.dm 2023-11-01 22:26:13 +00:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Killian 655114451e digitigrade legs port wip 2023-10-29 22:35:58 +00:00
VerySoft 8f04cb0228 VerySoft Fluff Item!
Adds big round glasses, and adjusts the entries for the ITG id fluff items so they aren't tied to a specific character, since I have the same thing on multiple characters.

As part of this I made it so that glasses can appear above hair and things if they have the appropriate var set. (Otherwise glasses sprites mostly get covered up by any hair that gets near your eyes). All the other glasses behave the old way, but this should allow people to make some glasses appear above hair and things if they want to in the future.
2023-10-24 14:48:25 -04:00
Killian 6cafbe5dce laserdome: miscellaneous additions
multimode lasertag guns with multihit rules, non-rotating mannequins, and new laserdome-specific gear lockers
2023-10-10 09:32:30 +01:00
Enzo-Leon f5cc531bb9 Feedback adjustments for improved sentence structue. 2023-10-02 12:27:31 -07:00
Enzo-Leon f13f395db7 Altevian Adjustments - Descriptions & Small Tweaks 2023-10-02 11:40:19 -07:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
Heroman3003andGitHub 24d9cf5e76 Merge pull request #15359 from SatinIsle/size-collar
Bluespace Collars
2023-09-10 08:58:22 +10:00
Heroman 9cdcc6de3a Fixes xenochimera body base suit s 2023-09-10 08:37:10 +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 799da0f9b8 Merge pull request #15291 from AmatsuDF/master
3 edited outfits
2023-08-23 06:23:29 +10:00
AmatsuDF a412309b95 Suggested updates
Changes names of items to fit suggestions.
2023-08-22 15:49:20 -04:00
AmatsuDF 1c4efa3816 Minor update
Forgot to indicate one outfit was recolorable.
Also adds one I forgot to include, the recolorable swoop dress.
2023-08-22 10:01:39 -04:00
AmatsuDF d0bdc4cb0a New Outfits
This PR contains three outfits: a shortsleeve hoodie variant, a greyscaled version of the Flame Dress, and a greyscaled version of the Yellow Dress. All three can be recolored in the loadout or by the recolor machines on all maps.
2023-08-22 02:57:56 -04:00
Heroman 871310778d A variety of fixes 2023-08-20 10:28:19 +10:00
Heroman e7ca865bd7 Fixes holstering micros 2023-08-10 19:58:36 +10:00
Killian a064ca5849 recolourable fingerless gloves 2023-07-28 14:39:55 +01:00
SatinIsle b4d0c76e07 Merge remote-tracking branch 'upstream/master' into Colourable-flannel 2023-07-20 10:04:19 +01:00
SatinIsle 935c8e56da Recolourable flannel
Added a recolourable flannel jacket. I have managed to make the whites light enough to show any colour whilst keeping the gradiants and the blacks.

It is a separate option to the other recolourable jackets, as I couldn't figure out the way to add it as a weak to the list without making the others recolourable too. I think that's just a limitation of the loadout system, as all other recolourable things seem to work the same way.
2023-07-19 20:34:54 +01:00
Heroman 3b40b37f9c Fluff updates 2023-07-18 15:10:43 +10:00
PastelPrinceDan 2e785628b5 ports a whole lot of clothes from citrp + hairs & gradients from skyrat 2023-06-29 01:09:46 +01:00
Heroman e00435729d Brings classic hard hats as alternate option 2023-06-27 06:06:45 +10:00
Heroman3003andGitHub 2b4eb3ffc8 Merge pull request #14989 from Runa-Dacino/climbing
Implements Climbing
2023-06-22 05:21:45 +10:00
izac112 ff7df50a7e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-21 19:03:35 +02:00
Runa Dacino 3e2e191741 fix(accessory): Fixes IAA badge permissions
*Tweaks holobadge definition to have per-badge defined access rather than have it hardcoded into attackby
*Tweaks holobadge attackby logic to use the newly introduced var for checking access
*Using these, fixes IAA "Investigator" badge from not being usable by IAA
*Kept security access for them for now, as that was the initial implementation and I don't want to change that in a bugfix. However, I believe it may be worth updating the detective/investigator badges to instead check for access_forensics_equipment instead (thus limiting them to detectives and IAA)
2023-06-20 15:34:43 +02:00
Heroman3003andGitHub 860fad8a75 Merge pull request #15043 from ItsSelis/spell-fixes-v2
Spell Fixes
2023-06-19 14:39:41 +10:00