diff --git a/asset_dev/props/sofa/sofa_parts.blend b/asset_dev/props/sofa/sofa_parts.blend index 803b134..d72ab18 100644 Binary files a/asset_dev/props/sofa/sofa_parts.blend and b/asset_dev/props/sofa/sofa_parts.blend differ diff --git a/asset_dev/props/sofa/sofa_parts.blend1 b/asset_dev/props/sofa/sofa_parts.blend1 index aace227..803b134 100644 Binary files a/asset_dev/props/sofa/sofa_parts.blend1 and b/asset_dev/props/sofa/sofa_parts.blend1 differ diff --git a/vault/TODO.md b/vault/TODO.md index 1783101..a491bcb 100644 --- a/vault/TODO.md +++ b/vault/TODO.md @@ -137,7 +137,7 @@ - [x] tank terminal - [x] tank animations - [ ] control console & launch button - - [ ] door + - [x] door - [ ] counters - [ ] coffee machine - [ ] [[airlock]] props: @@ -166,7 +166,7 @@ - [ ] regular desk (0.7x1.2x4.0) - [ ] wraparound desk - [ ] etc - - [ ] Make sofa cushions separate physics objects + - [x] Make sofa cushions separate physics objects - [x] Object hold UX - [x] holdable object HUD icon - [ ] highlight holdable objects? diff --git a/vault/elements/alarm.md b/vault/elements/alarm.md index 64adea8..dd4d6ff 100644 --- a/vault/elements/alarm.md +++ b/vault/elements/alarm.md @@ -1,9 +1,11 @@ +--- +tags: + - mechanics +--- Does nothing on its own, but increases the [[grunk alert]] when activated by a connected component like a [[tripwire]] or [[listener]]. Will activate if the player tries to remove with the spray beam. Can be safely deactivated & harvested with the [[toothbrush]]. Will be triggered automatically if it stops getting a pulse signal from a [[heart]]. If it doesn't get a pulse in the first place, it won't trigger. Therefore we can make puzzles without pulses by simply not including a [[heart]] in the network. -For flavor, maybe screeches or something when activated? - -tags: #mechanics \ No newline at end of file +For flavor, maybe screeches or something when activated? \ No newline at end of file diff --git a/vault/elements/grunk beast.md b/vault/elements/grunk beast.md index 68faaf4..7110b1d 100644 --- a/vault/elements/grunk beast.md +++ b/vault/elements/grunk beast.md @@ -1,3 +1,8 @@ +--- +tags: + - lore + - mechanics +--- A little fucking ghoulie!!! Summoned when the [[grunk alert]] maxes out. Hunts down the player and grunkifies 'em. @@ -25,6 +30,4 @@ Beasts spawn at every spawn point, all pursuing the player. Unavoidable death. Show cutscene with player grabbed by beast. -The player can reset the alert level to 2 by returning to the safe zone. - -tags: #mechanics #lore \ No newline at end of file +The player can reset the alert level to 2 by returning to the safe zone. \ No newline at end of file diff --git a/vault/elements/heart.md b/vault/elements/heart.md index 4d17d10..dc181ab 100644 --- a/vault/elements/heart.md +++ b/vault/elements/heart.md @@ -1,3 +1,5 @@ -Dead-man switch. Emits a pulse every few seconds which travels through the relay network to alarms. If an alarm stops receiving a pulse, it triggers automatically. - -tags: #mechanics \ No newline at end of file +--- +tags: + - mechanics +--- +Dead-man switch. Emits a pulse every few seconds which travels through the relay network to alarms. If an alarm stops receiving a pulse, it triggers automatically. \ No newline at end of file diff --git a/vault/elements/listener.md b/vault/elements/listener.md index 9b47e98..0d7d49e 100644 --- a/vault/elements/listener.md +++ b/vault/elements/listener.md @@ -1,10 +1,11 @@ +--- +tags: + - mechanics +--- Triggers a connected [[alarm]] when the player makes noise nearby. Noises include: - Jumping - Firing the spray beam - #maybe moving without sneaking? - #maybe using the MP3 player, just for fun -Grunk can be cleared silently with the [[toothbrush]]. - - -tags: #mechanics \ No newline at end of file +Grunk can be cleared silently with the [[toothbrush]]. \ No newline at end of file diff --git a/vault/elements/looker.md b/vault/elements/looker.md index 8fb23ae..d68f888 100644 --- a/vault/elements/looker.md +++ b/vault/elements/looker.md @@ -1,5 +1,8 @@ +--- +tags: + - mechanics + - maybe +--- the lookerrrrrrrr -A camera basically. If it sees the player it will trigger a connected [[alarm]]. - -tags: #mechanics \ No newline at end of file +A camera basically. If it sees the player it will trigger a connected [[alarm]]. \ No newline at end of file diff --git a/vault/elements/mechanisms.md b/vault/elements/mechanisms.md index 3c8c6cc..616bee1 100644 --- a/vault/elements/mechanisms.md +++ b/vault/elements/mechanisms.md @@ -1,9 +1,11 @@ +--- +tags: + - mechanics +--- Mechanical devices which can be used to control various things, e.g. bulkheads. Disabled when covered in grunk. Associated with [[color_palette]]: - Mechanisms which are disabled due to grunk (but can be enabled) should glow DANGER RED. - Mechanisms which have been cleaned off should glow SUCCESS GREEN. - Should make a distinct sound upon becoming clean enough to use. -- Mechanisms which are disabled after a one-time use should not glow with any color. - -tags: #mechanics \ No newline at end of file +- Mechanisms which are disabled after a one-time use should not glow with any color. \ No newline at end of file diff --git a/vault/elements/relay.md b/vault/elements/relay.md index 8d66cc1..8bc970a 100644 --- a/vault/elements/relay.md +++ b/vault/elements/relay.md @@ -1,5 +1,7 @@ +--- +tags: + - mechanics +--- Rebroadcasts trigger and pulse signals. The backbone "connection" of grunk component networks. Visually these should light up when passing along a signal, with red to indicate trigger signals & cyan to indicate pulse. - -tags: #mechanics \ No newline at end of file diff --git a/vault/elements/revealed lighting.md b/vault/elements/revealed lighting.md index 81fa0fc..c7537dd 100644 --- a/vault/elements/revealed lighting.md +++ b/vault/elements/revealed lighting.md @@ -1,5 +1,7 @@ +--- +tags: + - mechanics +--- You can illuminate dark areas by cleaning grunk off of light fixtures! -This is indicated to the player with a brighter "glowing" grunk material. - -tags: #mechanics \ No newline at end of file +This is indicated to the player with a brighter "glowing" grunk material. \ No newline at end of file diff --git a/vault/elements/spray beam.md b/vault/elements/spray beam.md index d115105..3f95007 100644 --- a/vault/elements/spray beam.md +++ b/vault/elements/spray beam.md @@ -1,3 +1,5 @@ -Power-washer for removing [[grunk]]. - -tags: #equipment \ No newline at end of file +--- +tags: + - equipment +--- +Power-washer for removing [[grunk]]. \ No newline at end of file diff --git a/vault/elements/toothbrush.md b/vault/elements/toothbrush.md index 8c6c554..0e764d1 100644 --- a/vault/elements/toothbrush.md +++ b/vault/elements/toothbrush.md @@ -1,9 +1,11 @@ +--- +tags: + - equipment +--- Removes a very small amount of grunk, _very slowly_. Comically inferior to the spray beam. Advantages over the beam: - Does not trigger [[listener]] - Does not trigger [[alarm]] -#lore: officially the _Advanced Grunk Reticulation System_ - -tags: #equipment \ No newline at end of file +#lore: officially the _Advanced Grunk Reticulation System_ \ No newline at end of file diff --git a/vault/elements/trigger.md b/vault/elements/trigger.md index 822b38d..12d64e7 100644 --- a/vault/elements/trigger.md +++ b/vault/elements/trigger.md @@ -1,3 +1,5 @@ -The most basic grunk mechanic. Emits a trigger signal when destroyed, setting off any connected [alarms](alarm). - -tags: #mechanics \ No newline at end of file +--- +tags: + - mechanics +--- +The most basic grunk mechanic. Emits a trigger signal when destroyed, setting off any connected [alarms](alarm). \ No newline at end of file diff --git a/vault/elements/tripwire.md b/vault/elements/tripwire.md index 0556e91..d8af8f3 100644 --- a/vault/elements/tripwire.md +++ b/vault/elements/tripwire.md @@ -1,3 +1,6 @@ -Triggers a connected [[alarm]] when touched or stepped on by the player. - -tags: #mechanics +--- +tags: + - mechanics + - maybe +--- +Triggers a connected [[alarm]] when touched or stepped on by the player. \ No newline at end of file