891 Commits
Author SHA1 Message Date
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Killian 3ff9ace3b9 Merge remote-tracking branch 'upstream/master' into kk-rings 2024-10-29 01:00:23 +00:00
Killian 4869595855 ring/watch accessory transfer 2024-10-29 00:23:23 +00:00
SatinIsle c56d5ab8e1 Bunny suits
Added 6 variations of bunny suits, all recolourable: A white bunny suit, a maid themed bunny suit, a white reverse bunny suit, a maid themed reverse bunny suit and the two reversed bunny suits without leg parts.

Changed the rabbit ears headwear to be recolourable.

Added a bunny tail accessory, recolourable.

Added all of the above to the costume vending machine.
2024-10-27 12:47:22 +00:00
ShadowLarkensandGitHub bcc107c7cd Ports tgstation/tgstation/pull/15673 (#16495)
* Ports tgstation/tgstation/pull/15673

* Add a small delay to icon updating to cover up SSoverlays

* Fix actions on robot modules
2024-10-20 17:12:24 +02:00
KashargulandGitHub b594520a74 next set of spans (#16434)
* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly
2024-10-16 23:37:27 +02:00
ShadowLarkensandGitHub e3277e5a84 TGUI Shock Collar (#16442)
* TGUI Shock Collar

* The rest of the shock collar UIs
2024-10-12 16:39:38 +02:00
Kashargul a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Kashargul e0d694e8ac rid of old span macros 2024-10-01 23:51:48 +02:00
Guti dc7ad02813 Deconf 2024-09-22 15:01:10 +02:00
Guti f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
SatinIsle 5b557c7257 A bunch of new clothes
Added 6 variants of feminine T-shirts, including midriffs, text and shoulder colours.

Added 2 new very short skirts, one with a split exposing one leg.

Added 4 recolourable belt accessories. Thin, thick, strap (no buckle) and studded.
2024-09-17 14:26:03 +01:00
Kashargul a123f87e68 some mind jobs 2024-09-12 23:48:31 +02:00
Kashargul 8a90ae6523 only missing alt titles 2024-09-12 22:48:14 +02:00
Kashargul 4ba7beeb9c up to field medic 2024-09-12 21:20:47 +02:00
Kashargul 8a3520e2e0 move all factions to defines 2024-09-12 20:17:41 +02:00
Kashargul 10dc8510b3 up to engineer 2024-09-12 02:01:36 +02:00
Kashargul 0425a4e396 up to officer 2024-09-12 00:00:11 +02:00
Kashargul dc8c545f65 rework access field access 2024-09-11 20:59:57 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
SatinIsle 4e0352cb23 Spiked wristband
Added a spiked wristband accessory to loadout and vending machines.
2024-09-03 13:53:48 +01:00
izac112 42b345b3cc Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-08-28 20:22:38 +02:00
92da6db226 yet another clothing port pr (#16105)
* loadout additions

* forgot a comma

* i forgor something

---------

Co-authored-by: PastelPrinceDan <amayahsslut@gmail.com>
2024-07-21 19:56:01 +10:00
izac112 b100ef57d6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 2024-05-10 21:16:15 +02:00
KillianandGitHub 333489f653 uniform insignia (#15957) 2024-05-04 16:51:11 +10:00
KillianandGitHub 097788529e Void Undersuit Tweaks (#15958)
* void undersuit tweaks

* Update eva_bodysuits.dm

* Revert "Update eva_bodysuits.dm"

This reverts commit 6f7acb6adfe9256f93d46115348be85aa4f90f6c.
2024-05-03 19:33:20 +10:00
izac112 f609ac8565 Merge branch 'release' of https://github.com/VOREStation/VOREStation into vore-update 2024-04-02 17:26:31 +02:00
SatinIsle 49219dbdbc Added wristbands
Added a single wristband for the left wrist that is recolourable.

Added 6 variants of a combo of three wristbands on the left wrist.
2024-03-10 19:54:01 +00: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 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
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
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
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
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +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
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