Commit Graph
1828 Commits
Author SHA1 Message Date
Stobarico b84c17254e Fixes conflicts 2022-05-24 19:46:22 -03:00
Guy be45d108fa Another typo on Fifi's fluff item. This time it should work. 2022-05-24 18:53:39 -03:00
CaseyandGitHub 421d3113d2 Merge pull request #12996 from Runa-Dacino/uno_eris
Ports card icons from Eris. Implements them for VOREStation
2022-05-22 18:10:30 -04:00
Runa DacinoandGitHub 7df48cc1f0 Fixes typo 2022-05-22 23:47:09 +02:00
Runa Dacino 016d06b103 Renames UNO to EGY
Copyright stuff.

Removed all instances of UNO I added and renmaed to EGY.

EGY is Hungarian for "one"
2022-05-22 21:40:39 +02:00
CaseyandGitHub dd7da1a0c5 Merge pull request #13004 from TheDavestDave/amor-stuffs
custom item stuff ahead of explo removeal
2022-05-22 14:32:05 -04:00
CaseyandGitHub ce50127b0a Merge pull request #12997 from Runa-Dacino/schnapsen_fix
Changes Schnapsen loadout description
2022-05-22 14:22:25 -04:00
TheDavestDave 5c17971587 Update loadout_fluffitems_vr.dm 2022-05-22 18:41:01 +01:00
TheDavestDave d5f796bc35 fluff item rework 2022-05-21 23:46:44 +01:00
Runa Dacino 81c93aa14d Changes Schnapsen loadout description
Forgot to change description when updating the icons to use william tell pattern.
2022-05-20 16:06:57 +02:00
Runa Dacino 31054014ac Adds UNO to loadout
Costs 1 point
2022-05-20 15:56:06 +02:00
Guy bfee3ede2c Fixes typo in Fifi's fluff loadout 2022-05-18 14:50:02 -03:00
izac112 5936b56802 unticks the vore fluff loadout 2022-05-18 12:47:16 +02:00
izac112 7d45855ef0 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-05-18 12:41:44 +02:00
CaseyandGitHub ed4c095589 Merge pull request #12985 from FunnyCatEnjoyer/Funnycat2
Adds Fifi the Magnificent's costume (Fluff item, Allweek)
2022-05-18 04:58:42 -04:00
CaseyandGitHub a55f8374da Merge pull request #12982 from FunnyCatEnjoyer/FunnyCatEnjoyer
Fixes dumb cat mistakes
2022-05-18 04:58:20 -04:00
Guy 2867b06548 Adds Fifi the Magnificent's costume 2022-05-16 18:27:17 -03:00
izac112 cd26d7770a Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-05-16 19:14:19 +02:00
Guy c1f7e7ee58 Fixes dumb cat mistakes 2022-05-15 23:47:56 -03:00
CaseyandGitHub 9006e9ab78 Merge pull request #12980 from FunnyCatEnjoyer/FunnyCatEnjoyer
Adds the planet collar!
2022-05-15 20:08:55 -04:00
Guy b8a3550515 Adds the planet collar! 2022-05-15 20:52:06 -03:00
Guy 708758e9c3 Adds the long wool coat and horse taur variant 2022-05-13 10:39:55 -03:00
Guy d9fe1af3b7 Adds the long wool furcoat, its horse taur variant and improves shading on the taur hos coat and warden alt coat 2022-05-13 10:15:50 -03:00
TheToaster98andGitHub 42a95cdc39 Change Datum for the new subtype
AAAAAA
2022-05-12 21:18:43 +02:00
TheToaster98andGitHub ec67313964 Update loadout_fluffitems_vr 2022-05-12 19:48:12 +02:00
ItsSelis ae6c47bba0 Update loadout_utility_vr.dm 2022-05-06 23:25:06 +02:00
izac112 ced55f4e65 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-05-02 17:50:27 +02:00
ItsSelis 69f70e19c2 Dosimeters 2022-04-30 18:01:12 +02:00
izac112 646b359e7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-20 22:19:52 +02:00
CaseyandGitHub c7c260881c Merge pull request #12763 from KillianKirilenko/kk-feedback
Verb Reset Buttons
2022-04-17 17:39:54 -04:00
GhostActual 2892390cb3 Base Commit 2022-04-17 13:15:30 -04:00
Killian 29354af314 verb reset buttons 2022-04-17 08:51:25 +01:00
Runa DacinoandGitHub 6601e9cac5 Schnapsen final (#2)
* Creates schnapsen_vr.dm

New card game deck for 2-player Schnapsen!

* Adds Schnapsen to loadout

* fixes tabs and capitalization

Accidentally set tabs to be space, indent of 2. Changed to the expected tab and 8. 

Also renamed file from _VR to _vr

* Adds schnapsen_vr.dm to #include

* Rename schnapsen_vr to schnapsen_vr.dm

* fixes slashes.

* grr webedits. fixed indentation
2022-04-16 02:00:26 +02:00
izac112 31b42f636a Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-07 16:59:48 +02:00
GhostActual 165d4f1e1a Loadouts 2022-04-04 03:03:10 -04:00
izac112 2a815d66d2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-03 16:56:15 +02:00
GhostActual 59c9199ace Base Commit 2022-04-01 02:42:14 -04:00
izac112 068da2c612 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-03-22 20:15:54 +01:00
GhostActual d4f6914140 Base Commit 2022-03-21 15:38:31 -04:00
GhostActual 3d6e55b45b Base Commit 2022-03-21 05:37:38 -04:00
PandoraandGitHub f51689296d removes the bag from loadout selection 2022-03-20 17:02:24 +00:00
PastelPrinceDan 032d9e80dc plushie :) 2022-03-19 21:24:13 +00:00
izac112 37e909fe88 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-03-15 20:01:19 +01:00
VerySoft 415bd3da22 Whitelist updoot 2022-03-13 17:42:33 -04:00
PandoraandGitHub 265d268c19 I wouldn't know how to land it 2022-03-13 07:38:21 +00:00
izac112 d9860865fb Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-03-11 15:54:12 +01:00
GhostActual 0ba03aaf09 Base Commit 2022-03-10 22:18:06 -05:00
PandoraandGitHub 91158267e9 but there is no real me 2022-03-09 05:31:43 +00:00
Heroman b6ad70799a Fixes weird char setup crash 2022-03-08 20:44:50 +10:00
izac112 74ee064587 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-03-07 16:16:38 +01:00