Commit Graph
357 Commits
Author SHA1 Message Date
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Jenny 93d14d4c14 improves Nikki item icon names to be a bit more readable 2023-06-26 04:18:00 -05:00
izac112 9cedb2ec47 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-03 19:53:45 +02:00
PandoraandGitHub 39961af893 Update custom_items_vr.dm 2023-05-13 03:17:05 +01:00
izac112 5c0a04dad0 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-04-30 14:31:02 +02:00
Runa DacinoandGitHub bc25bca37b Adds a custom fluff item for Mira 2023-04-09 19:20:30 +02:00
izac112 f61e9a6a39 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-29 21:52:44 +01:00
faaaay 4f2c9e371f custom item 2023-01-20 11:41:11 +00:00
izac112 2ef553df70 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-12-02 16:33:11 +01:00
PandoraandGitHub b2833bb51e Update custom_items_vr.dm 2022-11-13 20:37:02 +00:00
izac112 ff37a7ac7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-11-02 13:33:47 +01:00
TheDavestDave b03d705c48 fluff item spawns now
allowed_roles chaplain doesn't let you spawn in an item if you join as chaplain. I have no idea how to fix that
2022-10-24 16:51:21 +01:00
izac112 efa4a73716 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-08-28 12:48:22 +02:00
faaaayandGitHub f5fe70e073 comments out slavic 2022-08-24 09:04:03 +01:00
faaaay e38ced025d does it 2022-08-22 23:20:57 +01:00
izac112 71d069887c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-08 15:49:48 +02:00
ZodiacShadow 86d2acf6fc Nehi fluff items
Added Nehi's health service achievement medal and lightly altered her headphones to no longer take up the "headphones" namespace. Just to be considerate.
2022-07-05 16:09:36 +02:00
izac112 891967a990 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-06-06 15:26:15 +02:00
Stobarico b84c17254e Fixes conflicts 2022-05-24 19:46:22 -03:00
TheDavestDave d5f796bc35 fluff item rework 2022-05-21 23:46:44 +01:00
izac112 cd26d7770a Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-05-16 19:14:19 +02:00
TheToaster98andGitHub 17bdd34646 Make the tablet its own subtype
Please don't break
2022-05-12 20:13:48 +02:00
TheToaster98andGitHub bce935865d Update custom_items_vr.dm 2022-05-12 19:48:26 +02:00
izac112 2a815d66d2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-03 16:56:15 +02:00
GhostActual b268b7bcfa Base Commit 2022-04-01 01:03:30 -04:00
izac112 068da2c612 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-03-22 20:15:54 +01:00
PastelPrinceDan 032d9e80dc plushie :) 2022-03-19 21:24:13 +00:00
izac112 d1e595e7e7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-02-20 23:23:34 +01:00
izac112 aef8a94e94 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-02-19 18:19:45 +01:00
Hatterhat 40c9947bca bro i dont wanna talk about loadout_general.dm 2022-02-19 04:23:35 -06:00
PastelPrinceDan bbfb205625 rev claymore 2022-02-16 08:59:05 +00:00
izac112 19c8752ec7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-02-08 12:05:20 +01:00
TheDavestDave 2fd071e2d7 captails gone 2022-02-05 15:57:09 +00:00
TheDavestDave c2cc35f59d makes amour for lucky
it took three people to get this to work correctly
2022-02-04 22:09:04 +00:00
izac112 9b8f8e4ba3 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-12-04 17:39:36 +01:00
faaaay c5040421f2 adds fluff/jade_horror stamp 2021-12-03 20:19:21 +00:00
izac112 f9c441dc6d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-12-03 16:30:19 +01:00
Heroman f745f99b16 Adds Amaryll's claws fluff item 2021-11-28 10:33:50 +10:00
izac112 a274077bfa Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-10-28 21:04:37 +02:00
Aronai Sieyes e1068faac0 Rebase 2021-10-27 20:37:02 -04:00
izac112 897cf4b57e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-07-17 10:36:29 +02:00
577b986ba6 Convert some bools to TRUE/FALSE instead of 1/0. (#11100)
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-07-16 13:43:25 -04:00
izac112 dd8893112f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-07-08 09:40:23 +02:00
Aronai Sieyes b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
izac112 bcad22ac98 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-23 19:20:09 +02:00
Aronai Sieyes 85c31e9fda WIP fix of this PR 2021-06-21 19:29:43 -04:00
izac112 cb882173a1 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-31 02:28:47 +02:00
Aronai Sieyes b12b146343 VOREStation Specific Stuffs 2021-05-30 15:45:11 -04:00
izac112 4fce6a03ac Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-23 18:26:00 +02:00
Lunaball fe3f63b423 Adding an approved custom item
Adds Antoinette's ritual supplies. One glass knife, one harness, one bottle of ground poppy reagents.
2021-05-18 13:13:47 -06:00