84 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
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
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
izac112 42b345b3cc Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-08-28 20:22:38 +02:00
KillianandGitHub d3767ec44f selectors pass (#16137) 2024-08-01 15:56:48 +10: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 19e46d19b2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-17 01:06:24 +01:00
BonniePandora d561f31319 Replikant stuff
Items, robolimbs & markings
2024-02-06 00:25:50 +00:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
VerySoft ab74b5e5b5 Giant bow
It's a giant bow, you can equip it on your head or on your ear

I made this mostly as a fluff item for me, because of my character's ears, but I included a public version that anyone can use!
2023-07-15 14:43:02 -04:00
izac112 ff7df50a7e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-21 19:03:35 +02:00
Killian b238b3e560 loadout overhaul pt1
various overhauls to loadout menus
2023-06-13 20:31:03 +01:00
izac112 f61e9a6a39 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-29 21:52:44 +01:00
Detective-Google cce8ddc020 buh 2023-01-04 08:32:46 -06:00
Detective-Google 5858507b44 adds halos 2023-01-01 08:24:37 -06:00
izac112 261609b060 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-11-07 12:32:36 +01:00
Heroman dbe9387f5f Renames Engineer, new alt-titles for Stellar Delight 2021-11-02 19:56:49 +10:00
izac112 a274077bfa Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-10-28 21:04:37 +02:00
klaasjared 56f4ab1b4c Base Commit 2021-10-27 16:18:30 -04:00
izac112 84b075457b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-09-29 23:09:10 +02:00
Ghost ActualandGitHub 0085a5bd10 Adds more clothing from Polaris and various sources (#11546)
* Base Commit

* Secondary Commit

* Small Addition

* Small Fix

* Yet another Commit

* small fix

* Small Fix

* Small Addition

* More Commit

* I don't know how to stop

* ushanka

* Small Fix

* *aaaaaaa*

* another add-on

* Small Fix

* Revert "Small Fix"

This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.

* Conflict Fixes

* Revert "Conflict Fixes"

This reverts commit 1af644bdcab78018aa73525125b32e522d08db41.

* Conflict Fix 2
2021-09-27 14:31:10 -04:00
izac112 f3c88225ce Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-29 10:22:30 +02:00
Ghost ActualandGitHub 4bb386e166 Expanding Clothing Options (#11466)
* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix
2021-08-26 11:43:44 -04:00
izac112 4e14241cb8 Voreupdate 2021-07-21 15:16:48 +02:00
Aronai Sieyes 34982728cb Add 'as anything' to various for loops 2021-07-20 12:39:59 -04:00
izac112 9c6581fe6c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-03-11 17:36:42 +01:00
AtermoneraandVirgoBot a8409a3e1e Yet another clothing PR 2021-03-10 14:30:44 -05:00
izac112 edd05b01ac Merge branch 'release' of https://github.com/VOREStation/VOREStation into Voreupdate 2021-02-13 16:59:09 +01:00
NovacatandGitHub 3d1ec8ce42 Merge pull request #9540 from VOREStation/upstream-merge-7810
[MIRROR] Excised Errant Bay Military Lore
2021-02-13 00:50:25 -05:00
SchnayyandVirgoBot 92448560bb Medical Soft/Field Cap 2021-02-12 15:04:06 -05:00
CerebulonandVirgoBot 4fc2884f9f Excised Errant Bay Military Lore (#7810)
* Filth + Graffiti Fixes

* Excised Bad Lore

* Update filth.dm

why was this here oops i was on master
2021-01-01 00:40:56 -05:00
izac112 5d64303087 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-11-17 16:26:30 +01:00
SchnayyandVirgoBot 8f9edf0e57 5 new clothes & 1 headdress (#7733) 2020-10-17 06:15:54 -04:00
izac112 03f0165bd3 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-29 05:56:00 +02:00
AtermoneraandVirgoBot f612958f0c Merge pull request #7603 from Greenjoe12345/customloadout
adds the ability to give loadout items a custom name/description
2020-09-04 22:31:18 -04:00
izac112 50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
NovacatandGitHub 8e79488e0c Update loadout_head.dm 2020-07-31 16:47:36 -04:00
SchnayyandVirgoBot f9c3cf616e Clothes, clothes, clothes! 2020-07-31 04:02:49 -04:00
izac112 e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes 1bd327ce1e Merge upstream PR 2020-05-21 15:48:02 -04:00
NovacatandVirgoBot 872bc17937 Updates Solgov/Sifguard uniforms 2020-05-21 14:21:19 -04:00
Killian 8d2ec5f7fa loadout comments, improved warden/hos access modification 2020-03-17 15:44:23 +00:00
Killian 8b9f5e949a security pilot basics 2020-03-17 15:11:28 +00:00
Repede e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
2019-04-07 19:40:12 -04:00
mistyLuminescenceandVirgoBot 26ead98d6f Loadout item role tweaks (#5998)
* Loadout ItemRoles tweak
2019-03-30 04:10:16 -04:00