The Wait Is Over. (#49)

* Move submodule to Godot

* Update submodule AGAIN.

* Update project files.

* Remove WearableAnimatedSprite from prototypes.

* Remove content repo resource copier.

* Update submodule.

* Fix resource handling.

* Content.Client compiles by commenting out hands GUI.

* Update submodule.

* Fix prototype textures and update submodule.

* Update Submodule.

* Update submodule SOME MORE!

* Random WiP shit I guess

* Make omnisharp not choke on buildchecker.

* Update submodule.

* Highly WiP broken HandsGui code.

* Ok maybe let's not insult omnisharp.

* Fix annoying Omnisharp warning.

* Update submodule.

* Update submodule.

* Hey I forgot to push this but it didn't conflict!

* Fix hands GUI on godot.

* Update submodule.

* Obligatory submodule update.

* Work on exports.

* Work on exports.

* Update submodule.

* Update submodule.

* Fix dumb case mismatch between content and engine

* work pls.

* This maybe.

* Now!

* Update submodule.

* update submodule.

* Some WiP work on exporting aaah.

* OK READY FOR THE BUILDS SERVER.

* Probably should've made those commits in a different order.

* DO THE THING

* update submodule.

* Updates for effects system.

* Update submodule.

* Make file/line numbers show up on Windows Godot.

* Set submodule to master.

Resources/Prototypes/1_Temperature.yml

@@ -6,10 +6,10 @@
   - type: Clickable
   - type: Sprite
     sprites:
-    - shoes
+    - Items/shoes.png
 
   - type: Icon
-    icon: shoes
+    icon: Items/shoes.png
 
   - type: Damageable
     resistanceset: Standard

Resources/Prototypes/Entities/Clothing.yml

@@ -3,21 +3,19 @@
   id: ShoesItem
   name: Shoes
   components:
-  - type: WearableAnimatedSprite
-    sprite: player_shoes
-    notWornSprite: shoes
+  - type: Sprite
+    sprite: Items/shoes.png
 
   - type: Icon
-    icon: shoes
+    icon: Items/shoes.png
 
 - type: entity
   parent: BaseItem
   id: JanitorUniformItem
   name: Janitor Jumpsuit
   components:
-  - type: WearableAnimatedSprite
-    sprite: player_jumpsuit_gray
-    notWornSprite: janitorsuit
+  - type: Sprite
+    sprite: Items/janitorsuit.png
 
   - type: Icon
-    icon: janitorsuit
+    icon: Items/janitorsuit.png

Resources/Prototypes/Entities/Door.yml

@@ -7,13 +7,14 @@
   - type: Sprite
     drawdepth: FloorPlaceable
     sprites:
-    - door_ew
-    - door_ewo
+    - Objects/door_ew.png
+    - Objects/door_ewo.png
 
   - type: Icon
-    icon: door_ew
+    icon: Objects/door_ew.png
 
   - type: BoundingBox
+    aabb: "1,-0.75,2,0.75"
     sizeX: 1.9
     offsetY: 1.5
   - type: Collidable

Resources/Prototypes/Entities/HitscanWeapons.yml

@@ -3,21 +3,19 @@
   parent: BaseItem
   id: LaserItem
   components:
-  - type: WearableAnimatedSprite
-    notWornSprite: gun
-    sprite: gun
+  - type: Sprite
+    sprite: Objects/gun.png
   - type: Icon
-    icon: gun
+    icon: Objects/gun.png
   - type: HitscanWeapon
-  
+
 - type: entity
   name: GUN
   parent: BaseItem
   id: GUNITEM
   components:
-  - type: WearableAnimatedSprite
-    notWornSprite: projectileweapon
-    sprite: projectileweapon
+  - type: Sprite
+    sprite: Objects/projectileweapon.png
   - type: Icon
-    icon: gun
-  - type: ProjectileWeapon
+    icon: Objects/projectileweapon.png
+  - type: ProjectileWeapon

Resources/Prototypes/Entities/Items.yml

@@ -14,44 +14,40 @@
   parent: BaseItem
   id: RedToolboxItem
   components:
-  - type: WearableAnimatedSprite
-    notWornSprite: toolbox_r
-    sprite: player_toolbox
+  - type: Sprite
+    sprite: Items/toolbox_r.png
   - type: Icon
-    icon: toolbox_r
+    icon: Items/toolbox_r.png
 
 - type: entity
   name: "Mechanical Toolbox With Handle"
   parent: BaseItem
   id: BlueToolboxItem
   components:
-  - type: WearableAnimatedSprite
-    notWornSprite: toolbox_b
-    sprite: player_toolbox
+  - type: Sprite
+    sprite: Items/toolbox_b.png
   - type: Icon
-    icon: toolbox_b
+    icon: Items/toolbox_b.png
 
 - type: entity
   name: "Electrical Toolbox With Handle"
   parent: BaseItem
   id: YellowToolboxItem
   components:
-  - type: WearableAnimatedSprite
-    notWornSprite: toolbox_y
-    sprite: player_toolbox
+  - type: Sprite
+    sprite: Items/toolbox_y.png
   - type: Icon
-    icon: toolbox_y
+    icon: Items/toolbox_y.png
 
 - type: entity
   name: "Extra-Grip™ Mop"
   parent: BaseItem
   id: MopItem
   components:
-  - type: WearableAnimatedSprite
-    notWornSprite: mop
-    sprite: player_mop
+  - type: Sprite
+    sprite: Items/mop.png
   - type: Icon
-    sprite: mop
+    icon: Items/mop.png
 
 #handheld lights
 - type: entity
@@ -59,9 +55,8 @@
   parent: BaseItem
   id: FlashlightLantern
   components:
-  - type: WearableAnimatedSprite
-    notWornSprite: Flashlight
-    sprite: player_Flashlight
+  - type: Sprite
+    sprite: Items/Flashlight.png
   - type: Icon
-    icon: Flashlight
-  - type: PointLight
+    icon: Items/Flashlight.png
+  - type: PointLight

Resources/Prototypes/Entities/Power.yml

@@ -9,9 +9,9 @@
     drawdepth: FloorPlaceable
     color: Red
     sprites:
-    - eightdirwire
+    - Objects/eightdirwire.png
   - type: Icon
-    icon: eightdirwire
+    icon: Objects/eightdirwire.png
   - type: PowerTransfer
 
   snap:
@@ -35,11 +35,11 @@
   - type: Sprite
     drawdepth: FloorPlaceable
     sprites:
-    - generator
+    - Objects/generator.png
   - type: Icon
-    icon: generator
+    icon: Objects/generator.png
   - type: PowerGenerator
-  
+
 - type: entity
   id: WPPnobattery
   name: WPPnobattery
@@ -50,9 +50,9 @@
   - type: Sprite
     drawdepth: FloorPlaceable
     sprites:
-    - provider
+    - Objects/provider.png
   - type: Icon
-    icon: provider
+    icon: Objects/provider.png
   - type: PowerProvider
     Range: 5
     Priority: Provider
@@ -67,8 +67,8 @@
     Charge: 1000
     ChargeRate: 200
     ChargePowernet: false
-  
-  
+
+
 - type: entity
   id: SMES
   name: SMES
@@ -79,9 +79,9 @@
   - type: Sprite
     drawdepth: FloorPlaceable
     sprites:
-    - storage
+    - Objects/storage.png
   - type: Icon
-    icon: storage
+    icon: Objects/storage.png
   - type: PowerStorage
     Capacity: 3000
     Charge: 1000
@@ -99,9 +99,9 @@
   - type: Sprite
     drawdepth: FloorPlaceable
     sprites:
-    - wiredmachine
+    - Objects/wiredmachine.png
   - type: Icon
-    icon: wiredmachine
+    icon: Objects/wiredmachine.png
   - type: PowerDevice
     Drawtype: Node
     Load: 100
@@ -117,10 +117,10 @@
   - type: Sprite
     drawdepth: FloorPlaceable
     sprites:
-    - wirelessmachine
+    - Objects/wirelessmachine.png
   - type: Icon
-    icon: wirelessmachine
+    icon: Objects/wirelessmachine.png
   - type: PowerDevice
     Drawtype: Both
     Load: 200
-    Priority: Low
+    Priority: Low

Resources/Prototypes/Entities/Projectiles.yml

@@ -5,10 +5,9 @@
   - type: Transform
   - type: Sprite
     drawdepth: FloorPlaceable
-    sprites:
-    - projectilebullet
+    sprite: Objects/projectilebullet.png
   - type: Icon
-    icon: projectilebullet
+    icon: Objects/projectilebullet.png
   - type: BoundingBox
   - type: Physics
     edgeslide: false

Resources/Prototypes/Entities/Tools.yml

@@ -4,24 +4,22 @@
   id: Wirecutter
   components:
   - type: Wirecutter
-  - type: WearableAnimatedSprite
-    notWornSprite: wirecutter
-    sprite: wirecutter
+  - type: Sprite
+    sprite: Objects/wirecutter.png
   - type: Icon
-    icon: wirecutter
+    icon: Objects/wirecutter.png
   - type: MeleeWeapon
-    
+
 - type: entity
   name: Screwdriver
   parent: BaseItem
   id: Screwdriver
   components:
   - type: Screwdriver
-  - type: WearableAnimatedSprite
-    notWornSprite: screwdriver
-    sprite: screwdriver
+  - type: Sprite
+    sprite: Objects/screwdriver.png
   - type: Icon
-    icon: screwdriver
+    icon: Objects/screwdriver.png
   - type: MeleeWeapon
 
 - type: entity
@@ -30,11 +28,10 @@
   id: Welder
   components:
   - type: Welder
-  - type: WearableAnimatedSprite
-    notWornSprite: welder
-    sprite: welder
+  - type: Sprite
+    sprite: Objects/welder.png
   - type: Icon
-    icon: welder
+    icon: Objects/welder.png
   - type: MeleeWeapon
 
 - type: entity
@@ -43,34 +40,31 @@
   id: Wrench
   components:
   - type: Wrench
-  - type: WearableAnimatedSprite
-    notWornSprite: wrench
-    sprite: wrench
+  - type: Sprite
+    sprite: Objects/wrench.png
   - type: Icon
-    icon: wrench
+    icon: Objects/wrench.png
   - type: MeleeWeapon
-    
+
 - type: entity
   name: Crowbar
   parent: BaseItem
   id: Crowbar
   components:
   - type: Crowbar
-  - type: WearableAnimatedSprite
-    notWornSprite: crowbar
-    sprite: crowbar
+  - type: Sprite
+    sprite: Objects/crowbar.png
   - type: Icon
-    icon: crowbar
+    icon: Objects/crowbar.png
   - type: MeleeWeapon
-    
+
 - type: entity
   name: Multitool
   parent: BaseItem
   id: Multitool
   components:
   - type: Multitool
-  - type: WearableAnimatedSprite
-    notWornSprite: multitool
-    sprite: multitool
+  - type: Sprite
+    sprite: Objects/multitool.png
   - type: Icon
-    icon: multitool
+    icon: Objects/multitool.png

Resources/Prototypes/Entities/prototype_test.yml

@@ -5,9 +5,8 @@
   - type: Transform
   - type: Clickable
   - type: Sprite
-    sprites:
-    - medkit_r
+    sprite: Items/medkit_r.png
 
   - type: Icon
-    icon: medkit_r
+    icon: Items/medkit_r.png