diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-11 22:48:54 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-11 22:48:54 +0200 |
| commit | 177056420c5f31a0fb41e9ce0a67fc90cad4312e (patch) | |
| tree | 9198c043f160ec8880e4d90fd40dd8e81269d3ed | |
| parent | 678e1f329aecd2afd680d5740d89aa83eccb1cf4 (diff) | |
| parent | e6797f288c388fa408cb4d1cb790223e7684e23e (diff) | |
| download | hurrycurry-177056420c5f31a0fb41e9ce0a67fc90cad4312e.tar hurrycurry-177056420c5f31a0fb41e9ce0a67fc90cad4312e.tar.bz2 hurrycurry-177056420c5f31a0fb41e9ce0a67fc90cad4312e.tar.zst | |
Merge branch 'master' of https://codeberg.org/hurrycurry/hurrycurry
| -rw-r--r-- | client/map/tiles/conveyor_model.gd | 15 | ||||
| -rw-r--r-- | client/map/tiles/counter.gd | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/client/map/tiles/conveyor_model.gd b/client/map/tiles/conveyor_model.gd index 66706ddd..6e4a8da1 100644 --- a/client/map/tiles/conveyor_model.gd +++ b/client/map/tiles/conveyor_model.gd @@ -1,3 +1,18 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 nokoe +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. +# class_name ConveyorModel extends Node3D diff --git a/client/map/tiles/counter.gd b/client/map/tiles/counter.gd index c07407ae..59a8296a 100644 --- a/client/map/tiles/counter.gd +++ b/client/map/tiles/counter.gd @@ -26,6 +26,8 @@ const COUNTERS: Array = [ const FLOORS: Array = [ "floor", "grass", + "table", + "chair" ] enum CounterKind { |