Commit e117ade1 authored by Julia Santos's avatar Julia Santos

Merge branch 'master' into 'test'

# Conflicts:
#   Event Handler.gd
#   Scripts/Clothes trail.gd
parents 4a4fa48b 276a82af
...@@ -107,6 +107,7 @@ func get_lab_notes(): # returns how many lab notes the player has found ...@@ -107,6 +107,7 @@ func get_lab_notes(): # returns how many lab notes the player has found
func _add_clothes(): func _add_clothes():
clothes = clothes + 1 clothes = clothes + 1
print("Clothes: " + str(clothes))
func get_clothes(): func get_clothes():
return clothes return clothes
......
extends StaticBody2D
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment