From 73f4442410750ecefacfe71bd9666526fbd1a181 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Date: Fri, 24 Aug 2018 13:14:38 +0200
Subject: [PATCH] Engine Culling (#104)

* Move groups.yml to content.

* Add unpowered light prototype from engine.

* Move prototypes and textures over.

* Update submodule
---
 Resources/Groups/groups.yml                   |  34 +++++++++++++
 Resources/Maps/stationstation.yml             |  12 ++---
 Resources/Prototypes/1_Temperature.yml        |   4 +-
 .../Prototypes/Construction/structures.yml    |   4 +-
 Resources/Prototypes/Entities/Clothing.yml    |   8 +--
 Resources/Prototypes/Entities/Items.yml       |  20 ++++----
 Resources/Prototypes/Entities/Lights.yml      |  46 ++++++++++++++++++
 Resources/Prototypes/Entities/Mobs.yml        |  23 ++++++++-
 .../Prototypes/Entities/PoweredLighting.yml   |  27 ----------
 .../Prototypes/Entities/prototype_test.yml    |   4 +-
 Resources/Prototypes/Entities/table.yml       |  16 ++++++
 Resources/Prototypes/Entities/walls.yml       |   3 +-
 Resources/Prototypes/Tiles/floors.yml         |   4 ++
 Resources/Prototypes/Tiles/space.yml          |   4 ++
 .../Textures/Buildings/wall.rsi/full.png      | Bin 0 -> 321 bytes
 .../Textures/Buildings/wall.rsi/meta.json     |   2 +-
 .../Textures/Mob/greyshirt.rsi/greyshirt.png  | Bin 0 -> 2736 bytes
 .../Textures/Mob/greyshirt.rsi/meta.json      |  15 ++++++
 Resources/Textures/Objects/Flashlight.png     | Bin 0 -> 259 bytes
 Resources/Textures/Objects/Toolbox_b.png      | Bin 0 -> 241 bytes
 Resources/Textures/Objects/Toolbox_y.png      | Bin 0 -> 241 bytes
 Resources/Textures/Objects/armour.png         | Bin 0 -> 251 bytes
 Resources/Textures/Objects/backpack.png       | Bin 0 -> 241 bytes
 Resources/Textures/Objects/door_ew.png        | Bin 0 -> 628 bytes
 Resources/Textures/Objects/door_ewo.png       | Bin 0 -> 1334 bytes
 Resources/Textures/Objects/janitorsuit.png    | Bin 0 -> 241 bytes
 Resources/Textures/Objects/medkit_r.png       | Bin 0 -> 675 bytes
 Resources/Textures/Objects/mop.png            | Bin 0 -> 203 bytes
 Resources/Textures/Objects/shoes.png          | Bin 0 -> 188 bytes
 Resources/Textures/Objects/toolbox_r.png      | Bin 0 -> 241 bytes
 Resources/Textures/Objects/worktop_single.png | Bin 0 -> 517 bytes
 Resources/Textures/Tiles/copyright.txt        |   3 ++
 Resources/Textures/Tiles/floor_steel.png      | Bin 0 -> 132 bytes
 engine                                        |   2 +-
 34 files changed, 174 insertions(+), 57 deletions(-)
 create mode 100644 Resources/Groups/groups.yml
 create mode 100644 Resources/Prototypes/Entities/Lights.yml
 create mode 100644 Resources/Prototypes/Entities/table.yml
 create mode 100644 Resources/Prototypes/Tiles/floors.yml
 create mode 100644 Resources/Prototypes/Tiles/space.yml
 create mode 100644 Resources/Textures/Buildings/wall.rsi/full.png
 create mode 100644 Resources/Textures/Mob/greyshirt.rsi/greyshirt.png
 create mode 100644 Resources/Textures/Mob/greyshirt.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Flashlight.png
 create mode 100644 Resources/Textures/Objects/Toolbox_b.png
 create mode 100644 Resources/Textures/Objects/Toolbox_y.png
 create mode 100644 Resources/Textures/Objects/armour.png
 create mode 100644 Resources/Textures/Objects/backpack.png
 create mode 100644 Resources/Textures/Objects/door_ew.png
 create mode 100644 Resources/Textures/Objects/door_ewo.png
 create mode 100644 Resources/Textures/Objects/janitorsuit.png
 create mode 100644 Resources/Textures/Objects/medkit_r.png
 create mode 100644 Resources/Textures/Objects/mop.png
 create mode 100644 Resources/Textures/Objects/shoes.png
 create mode 100644 Resources/Textures/Objects/toolbox_r.png
 create mode 100644 Resources/Textures/Objects/worktop_single.png
 create mode 100644 Resources/Textures/Tiles/copyright.txt
 create mode 100644 Resources/Textures/Tiles/floor_steel.png

diff --git a/Resources/Groups/groups.yml b/Resources/Groups/groups.yml
new file mode 100644
index 0000000000..0ec624676b
--- /dev/null
+++ b/Resources/Groups/groups.yml
@@ -0,0 +1,34 @@
+- Index: 1
+  Name: Player
+  Commands:
+  - login
+  - joingame
+  - help
+  - list
+  - say
+  - whisper
+  - me
+  - ooc
+
+- Index: 50
+  Name: Moderator
+  Commands:
+  - login
+  - joingame
+  - help
+  - list
+  - say
+  - whisper
+  - me
+  - ooc
+
+- Index: 100
+  Name: Administrator
+  Commands:
+  - joingame
+  - help
+  - list
+  - say
+  - whisper
+  - me
+  - ooc
diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index 3a0e1273ff..c4dfcd136e 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -228,7 +228,7 @@ entities:
     pos: 4.5,-0.5
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: -2.5,4.5
@@ -270,13 +270,13 @@ entities:
     pos: 3,4
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: -0.5,4.5
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: 1.5,4.5
@@ -360,7 +360,7 @@ entities:
     pos: 1.546875,4.484375
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: 1.5,7.5
@@ -516,13 +516,13 @@ entities:
     pos: 6,-7
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: -2.5,7.5
     rot: -1.570796
     type: Transform
-- type: __engine_worktop
+- type: table
   components:
   - grid: 0
     pos: -0.5,7.5
diff --git a/Resources/Prototypes/1_Temperature.yml b/Resources/Prototypes/1_Temperature.yml
index fb61693eb1..8e60b57706 100644
--- a/Resources/Prototypes/1_Temperature.yml
+++ b/Resources/Prototypes/1_Temperature.yml
@@ -4,10 +4,10 @@
   components:
   - type: Clickable
   - type: Sprite
-    texture: Items/shoes.png
+    texture: Objects/shoes.png
 
   - type: Icon
-    texture: Items/shoes.png
+    texture: Objects/shoes.png
 
   - type: Damageable
     resistanceset: Standard
diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml
index a6a70bb8f1..e16ff1b716 100644
--- a/Resources/Prototypes/Construction/structures.yml
+++ b/Resources/Prototypes/Construction/structures.yml
@@ -5,7 +5,7 @@
   description: Keeps the air in and the greytide out.
   icon: Tiles/wall_texture.png
   objecttype: Structure
-  result: __engine_wall
+  result: wall
   placementmode: SnapgridBorder
   steps:
   - material: Metal
@@ -24,7 +24,7 @@
   id: table
   category: Structures
   icon: Objects/worktop_single.png
-  result: __engine_worktop
+  result: table
   placementmode: SnapgridCenter
   steps:
   - material: Metal
diff --git a/Resources/Prototypes/Entities/Clothing.yml b/Resources/Prototypes/Entities/Clothing.yml
index ccc745fcac..cef7bf3a2c 100644
--- a/Resources/Prototypes/Entities/Clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing.yml
@@ -13,10 +13,10 @@
   description: Don't take them off at your office Christmas party
   components:
   - type: Sprite
-    texture: Items/shoes.png
+    texture: Objects/shoes.png
 
   - type: Icon
-    texture: Items/shoes.png
+    texture: Objects/shoes.png
 
   - type: Clothing
     Slots:
@@ -29,10 +29,10 @@
   description: The jumpsuit for the poor sop with a mop
   components:
   - type: Sprite
-    texture: Items/janitorsuit.png
+    texture: Objects/janitorsuit.png
 
   - type: Icon
-    texture: Items/janitorsuit.png
+    texture: Objects/janitorsuit.png
 
   - type: Clothing
     Slots:
diff --git a/Resources/Prototypes/Entities/Items.yml b/Resources/Prototypes/Entities/Items.yml
index bf8b861033..578cea7125 100644
--- a/Resources/Prototypes/Entities/Items.yml
+++ b/Resources/Prototypes/Entities/Items.yml
@@ -18,9 +18,9 @@
   description: A shiny red and robust container
   components:
   - type: Sprite
-    texture: Items/toolbox_r.png
+    texture: Objects/toolbox_r.png
   - type: Icon
-    texture: Items/toolbox_r.png
+    texture: Objects/toolbox_r.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -33,9 +33,9 @@
   description: A blue box, not the kind you're thinking of
   components:
   - type: Sprite
-    texture: Items/Toolbox_b.png
+    texture: Objects/Toolbox_b.png
   - type: Icon
-    texture: Items/Toolbox_b.png
+    texture: Objects/Toolbox_b.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -48,9 +48,9 @@
   description: A toolbox typically stocked with electrical gear
   components:
   - type: Sprite
-    texture: Items/Toolbox_y.png
+    texture: Objects/Toolbox_y.png
   - type: Icon
-    texture: Items/Toolbox_y.png
+    texture: Objects/Toolbox_y.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -63,9 +63,9 @@
   description: A mop that cant be stopped, viscera cleanup detail awaits
   components:
   - type: Sprite
-    texture: Items/mop.png
+    texture: Objects/mop.png
   - type: Icon
-    texture: Items/mop.png
+    texture: Objects/mop.png
   - type: Item
     Size: 10
 
@@ -77,7 +77,7 @@
   description: They light the way to freedom
   components:
   - type: Sprite
-    texture: Items/Flashlight.png
+    texture: Objects/Flashlight.png
   - type: Icon
-    texture: Items/Flashlight.png
+    texture: Objects/Flashlight.png
   - type: PointLight
diff --git a/Resources/Prototypes/Entities/Lights.yml b/Resources/Prototypes/Entities/Lights.yml
new file mode 100644
index 0000000000..c316d86bce
--- /dev/null
+++ b/Resources/Prototypes/Entities/Lights.yml
@@ -0,0 +1,46 @@
+- type: entity
+  id: wall_light
+  name: "Unpowered Light"
+  components:
+  - type: Clickable
+  # So we can click on it for deletion.
+  - type: BoundingBox
+  - type: Sprite
+    sprite: Objects/lighting.rsi
+    state: on
+
+  - type: Icon
+    sprite: Objects/lighting.rsi
+    state: on
+
+  - type: PointLight
+    radius: 8
+    energy: 1.2
+    offset: "0, -16"
+    color: "#DCDCC6"
+
+  placement:
+    snap:
+    - Wallmount
+
+- type: entity
+  name: Light
+  id: poweredlight
+  parent: wall_light
+  components:
+  - type: Sprite
+    sprite: Objects/lighting.rsi
+    state: off
+
+  - type: Icon
+    sprite: Objects/lighting.rsi
+    state: off
+
+  - type: PointLight
+    state: Off
+
+  - type: PowerDevice
+    load: 50
+    priority: Low
+
+  - type: PoweredLight
diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/Mobs.yml
index 2d8efa40d2..8eab5f9abb 100644
--- a/Resources/Prototypes/Entities/Mobs.yml
+++ b/Resources/Prototypes/Entities/Mobs.yml
@@ -2,7 +2,6 @@
   save: false
   name: Urist McHands
   id: HumanMob_Content
-  parent: __engine_human
   description: A miserable pile of secrets
   components:
   - type: Hands
@@ -11,6 +10,28 @@
     - right
   - type: Inventory
   - type: Constructor
+  - type: Clickable
+  - type: Sprite
+    sprite: Mob/greyshirt.rsi
+    state: greyshirt
+    scale: 2, 2
+    drawdepth: Mobs
+
+  - type: Icon
+    sprite: Mob/greyshirt.rsi
+    state: greyshirt
+
+  - type: BoundingBox
+    aabb: "0.15,-0.45,1.05,0.45"
+
+  - type: Physics
+    mass: 5
+
+  - type: Collidable
+    DebugColor: "#0000FF"
+
+  - type: Input
+    context: "human"
 
 - type: entity
   id: MobObserver
diff --git a/Resources/Prototypes/Entities/PoweredLighting.yml b/Resources/Prototypes/Entities/PoweredLighting.yml
index 5093dca3be..e69de29bb2 100644
--- a/Resources/Prototypes/Entities/PoweredLighting.yml
+++ b/Resources/Prototypes/Entities/PoweredLighting.yml
@@ -1,27 +0,0 @@
-- type: entity
-  name: Light
-  id: poweredlight
-  components:
-  - type: Clickable
-  # So we can click on it for deletion.
-  - type: BoundingBox
-  - type: Sprite
-    sprite: Objects/lighting.rsi
-    state: off
-
-  - type: Icon
-    sprite: Objects/lighting.rsi
-    state: off
-
-  - type: PointLight
-    state: Off
-    radius: 8
-    energy: 1.2
-    offset: "0, -16"
-    color: "#DCDCC6"
-
-  - type: PowerDevice
-    load: 50
-    priority: Low
-
-  - type: PoweredLight
diff --git a/Resources/Prototypes/Entities/prototype_test.yml b/Resources/Prototypes/Entities/prototype_test.yml
index 11481768ed..cd7255b39a 100644
--- a/Resources/Prototypes/Entities/prototype_test.yml
+++ b/Resources/Prototypes/Entities/prototype_test.yml
@@ -4,8 +4,8 @@
   components:
   - type: Clickable
   - type: Sprite
-    texture: Items/medkit_r.png
+    texture: Objects/medkit_r.png
 
   - type: Icon
-    texture: Items/medkit_r.png
+    texture: Objects/medkit_r.png
 
diff --git a/Resources/Prototypes/Entities/table.yml b/Resources/Prototypes/Entities/table.yml
new file mode 100644
index 0000000000..2885b7119f
--- /dev/null
+++ b/Resources/Prototypes/Entities/table.yml
@@ -0,0 +1,16 @@
+- type: entity
+  id: table
+  name: "[engine] worktop"
+  components:
+  - type: Clickable
+  - type: Sprite
+    texture: Objects/worktop_single.png
+
+  - type: Icon
+    texture: Objects/worktop_single.png
+
+  - type: BoundingBox
+    aabb: "-0.45,-1,0.95,1"
+    DebugColor: "#0000FF"
+
+  - type: Collidable
diff --git a/Resources/Prototypes/Entities/walls.yml b/Resources/Prototypes/Entities/walls.yml
index a03248a390..2af7923347 100644
--- a/Resources/Prototypes/Entities/walls.yml
+++ b/Resources/Prototypes/Entities/walls.yml
@@ -10,7 +10,8 @@
     sprite: Buildings/wall.rsi
 
   - type: Icon
-    texture: Tiles/wall_texture.png
+    sprite: Buildings/wall.rsi
+    state: full
 
   - type: BoundingBox
   - type: Collidable
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
new file mode 100644
index 0000000000..3c3ef553f6
--- /dev/null
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -0,0 +1,4 @@
+- type: tile
+  name: Floor
+  texture: "floor_steel"
+  id: 1
diff --git a/Resources/Prototypes/Tiles/space.yml b/Resources/Prototypes/Tiles/space.yml
new file mode 100644
index 0000000000..533f4bcb4a
--- /dev/null
+++ b/Resources/Prototypes/Tiles/space.yml
@@ -0,0 +1,4 @@
+- type: tile
+  name: Space
+  texture: ""
+  id: 0
diff --git a/Resources/Textures/Buildings/wall.rsi/full.png b/Resources/Textures/Buildings/wall.rsi/full.png
new file mode 100644
index 0000000000000000000000000000000000000000..21a102bb3a9ddc4ca5e1e090ee56a44f4c0de0fc
GIT binary patch
literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6#VSz
z;usQf`0aE<z7_=m*PFb(Q)M}2%{P3rlba+RQOs;5Y^8PTuIyO}Q<w7120;eBP96Wx
zb{PFP<T>13>%?(T<FKW9yk*z++|$4IsSC;<FKm4f{V{Wv2ZIB*qJ>|>4#T!Lq7BQg
zRWUkzT=#m$R<qR`g0iN+n0!~pn&E^TM{!#Hnh$S99~|!#aN4GIV6#5sIkEr3zL#U(
zGset_k`eB5obpvPq=74dQOkkV;&=LTi=H|w-eQNEtNaZG>-HI3OP{ipJ;^ruRL9pj
zsb5-xPE|T2`dp}QP`gw7B`ai~fN<Pe$z35{92Y*_(|=ZyJ@w$~z}uhAg*5U6jSp{Z
Q2YR2u)78&qol`;+0NXcw<NyEw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Buildings/wall.rsi/meta.json b/Resources/Textures/Buildings/wall.rsi/meta.json
index c6a0575630..e9a4e8c52a 100644
--- a/Resources/Textures/Buildings/wall.rsi/meta.json
+++ b/Resources/Textures/Buildings/wall.rsi/meta.json
@@ -1 +1 @@
-{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.","size":{"x":32,"y":32},"states":[{"name":"solid0","select":[],"flags":{},"directions":4},{"name":"solid1","select":[],"flags":{},"directions":4},{"name":"solid2","select":[],"flags":{},"directions":4},{"name":"solid3","select":[],"flags":{},"directions":4},{"name":"solid4","select":[],"flags":{},"directions":4},{"name":"solid5","select":[],"flags":{},"directions":4},{"name":"solid6","select":[],"flags":{},"directions":4},{"name":"solid7","select":[],"flags":{},"directions":4}]}
\ No newline at end of file
+{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.","size":{"x":32,"y":32},"states":[{"name":"full","select":[],"flags":{},"directions":1},{"name":"solid0","select":[],"flags":{},"directions":4},{"name":"solid1","select":[],"flags":{},"directions":4},{"name":"solid2","select":[],"flags":{},"directions":4},{"name":"solid3","select":[],"flags":{},"directions":4},{"name":"solid4","select":[],"flags":{},"directions":4},{"name":"solid5","select":[],"flags":{},"directions":4},{"name":"solid6","select":[],"flags":{},"directions":4},{"name":"solid7","select":[],"flags":{},"directions":4}]}
diff --git a/Resources/Textures/Mob/greyshirt.rsi/greyshirt.png b/Resources/Textures/Mob/greyshirt.rsi/greyshirt.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcac399bc2c1bb24006b736ba0ba86816fb5db80
GIT binary patch
literal 2736
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mob/greyshirt.rsi/meta.json b/Resources/Textures/Mob/greyshirt.rsi/meta.json
new file mode 100644
index 0000000000..e05ed51049
--- /dev/null
+++ b/Resources/Textures/Mob/greyshirt.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "greyshirt",
+            "directions": 4,
+            "select": [],
+            "flags": {}
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Flashlight.png b/Resources/Textures/Objects/Flashlight.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7b3b4678de53ed2c9a4d24e055e8d1a0767b92d
GIT binary patch
literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5u*Z&O-+={6-$#+#<R*37@
z*~FbGE-n@q7gx2L5FZ~eq+PRDUDeCWtE#F>$!^Nblh?NaH8Pe2`2{mLJiCzw<g|FY
zIEH9UOiqw!YzXx9^o%^osHm_cXH8DdlBNKK6b6-<f=o)w4!XG=b1cw(nJTwXfg$){
zn5FH~#fuLgJ<7T);n^9Z>7lE`-p6cZP%8NI?yl7S(AD$&ctsny&diB?{7cUyAV5It
zK(OWCjyukdJInbKx5=y*6sb|?2xlmnuE27DHG_{~{UQ~=2dAGZ1Kq>m>FVdQ&MBb@
E0812FE&u=k

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Toolbox_b.png b/Resources/Textures/Objects/Toolbox_b.png
new file mode 100644
index 0000000000000000000000000000000000000000..dadba6320c1ee3c291945cf67d3bedab2cb72d50
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*Z=?jv&)AI`CL_tz0a<a
zsS$CC*Kz^B<4#>&T^{2JOO`C@lDIYpsF<-N$S;_|;n|HeAg9jL#W6%<Vse5+j6*<x
zK<oJxIXNl~ItnZy3p*Zc+QG4N#}18MI}WhSnKH%6*?H=eIWh~lrYtz%%c?kG8qmmh
zY*!yon>Ov*MK+a~kOZcg#=EW3&&_$cj>$ZD<zh_}6P`#0mMa%n58Vk4U<o;VM@C><
m1LK*cdIk?1iWDviGBAX&Dz>t=PALMqgu&C*&t;ucLK6VY*;O6@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Toolbox_y.png b/Resources/Textures/Objects/Toolbox_y.png
new file mode 100644
index 0000000000000000000000000000000000000000..e04977356d6377d3df223faf6f9983b0fd703f0e
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*Z=?j7sN7rxXAGTA$wyE
z!;hN`yB9EA+0I~XrnGtz!=`n!w?>_q3slTl666=m;PC858jw@x>EaloF)=woBE}&g
zK%n*fikuvk1|0>KkcAx&HtpcpxnqaMt{n$h=1iI5<m^0k${d*mTvHYt@MTq;Fm1__
zCGXg-KAtvh+O>;pDls7mOf!vlTcw|y^Ku=NdGN}`nkFVZkqj(XF0dZD6CA)2a`=vn
oz_td)GfVXh9yk;!Tohzr2w_!hWo?~O1at|5r>mdKI;Vst0L*w<K>z>%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/armour.png b/Resources/Textures/Objects/armour.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e2d2e941f2830e3c099cb15f15606f246dbfba1
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvl>na*SBC!#H8nLro}+_9U|^t}
zoLp#VXkK0(KR<tDWTdOBtC*Nru#53wpbEy4AirP+hi5m^fSguO7sn8diOC5P4hk9v
z4jj<vcwnrx+sL3rg7W}t#APo@i9?r}1elJ=EnKL3jDt~a`<K4HO(v`@idmUYpJsaU
zoM3Wj&@w1~W}?ElEY-MCK{Aoe+=by}R0(5RM+4&|u?Y(`q8zR%aZ5C_Oqg>{AeAj-
tgUHFmHQl|vYbS^p7_=}k9(G`2xFM>;arRa8eV~IFJYD@<);T3K0RUHEOsW6?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/backpack.png b/Resources/Textures/Objects/backpack.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc29a262af744429bb56cc93b978e01267194e77
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*Z=?j+uGVzR8+LKwz|5y
zMn^}RnVDVK7;^)tfUzXVFPOpM*^M+Hr_0mDF+^kH*$IYx%?3OShcC_KdCBbbknybd
zn^R|WC;k1e{$N5<cxvhcv-y4#=L)QIS@XrN+&NHAFKAuQJe4aCJoVm%H2++l5Ol+3
zdW6f2#hgOEEeBbQo=+4PZd&9dR<Zr3nc`kA#X0K2x07zRym|DwR=8ldD)WqtR_?6r
nZ<JiJ8s5tNfA+Y4?pdxSf~p@2pGMaKUB%$(>gTe~DWM4fqF`Qz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/door_ew.png b/Resources/Textures/Objects/door_ew.png
new file mode 100644
index 0000000000000000000000000000000000000000..e05a5bffb9257392e79de91ee0c091edb96f230d
GIT binary patch
literal 628
zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3-pO;^#*IDVB6cUq=RpjeRx011AId3dtTp
zz6=cQ{6G~z{1>RH(Sd=XwvvJ2Wj6zZ%~J*j$uq?^t>r+qt^qzFuK)l4KluWI)YQ~`
ze0(--+T`QzG;`+6dGqF-Idi6=p+V-gc}GWw+yUbS3l{h=FccLP_4V~ln>I~bRSsx^
zmcgE>Km%Dzg8YIR@-vf5JEpIh0~BCP@^*J&=wOxg0CG4BJR*x382Ao?FyoGi*>8b@
z>?NMQuIvwaWcajX_OstQ0~C7X>EalYaqsO6N1-MI9#?LUY)6+3_x`V1cA;<~v&(*N
zt3StmX8Yb#(cG}YutmV>#JUxZKDmk-3m(KX{Rk}+P_l6DIN%)Mz{o1{CThb!>3or<
zMQf&M_^)-^Fh@UwCG;Ot1)FOp=d7}+xd+PwCTxD7l+d(pcT&^7<1FTks}m#+NV+)w
z*|Z^9gjsEam`Km#hpf6*N38EOo&VYH1T-_Cz{8QlQLJ*AMcZdJ?>nNROa54zw>}ij
zX8q?pLF;Gif^`X5*OtH8F8LzrhFvSWORk&1A1{&Jf~9=<jJrj*iLF<tKPdce_S5eD
z$}1iMeXCmH8c~vxSdwa$T$Bo=7>o=I&2<fpbd4-R42`W!jI4|-v<(cc3=F;;4nBdR
zAvZrIGp!Q0hSqtnOMn_AKsE&Dr<If^7Ns&2BxdH7=;fuBD46IO=$WRr8l?i&FnGH9
KxvX<aXaWG)_2QHO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/door_ewo.png b/Resources/Textures/Objects/door_ewo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4f0c19b570e38ecdcd6721b68cab3023727072d
GIT binary patch
literal 1334
zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3-pO;^#*IDTQQ@AYTTCDpjC(GXulV|3LaB
z14F3+1H-EX1_rAc3=HD=lj4uMF)%PQ1o(uw0`+LC%BiWT`M5jz`1lkR70sMEbJM0x
zK=Dy98Un*U1nhn@{bOKYWGD&p3;sW{0YmV2c3`=|z**oCS<Jw|cMyabcTCKF3lx+n
zag8Vm&QB{TPb^AhC`ioAE78kKEm1JhGte_lZ8b^-s%h|aaSX|DetW~3?|=diOQ4h8
zo&QH%vL7(rW9pLZD)CqIlA4~!#;|~aL4={<7Uz`{jB>0D8)P@wKV2sCAdK&WCeRE9
z23Dv7CWZh81}+8%Mj4i#xiPC4_n1~+V+r48+Boww-y)%GPv!qy8)un*QlD|Ygq`8@
cd5>$q`3rfTAGGf&DFPYe>FVdQ&MBb@0CIR@7ytkO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/janitorsuit.png b/Resources/Textures/Objects/janitorsuit.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbc1e5474188e1ab12e7b4726516b1d4b75a8e82
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5uSBC!#F)=YEB_&g)OsS}-
zc=ztz{Q2|K($ebc>WYht-QC@NeSNQ9y_%Ae;_vU@=(b@mP$OeWkY6x^!?PP{Ku(dT
zi(`n!#N-4CpN7DbH#`I*9gY}UTySOZbhzOWazeth;o^;mz?(M&JP(|>apnd`<bew}
z?f`iWju&nmx*>2gz-<CUm$h27#Nr*!1<P6|Ds7r}Rn$!ED)$5yv3q+<zAJS#Y+SHG
laTCLJ>&TtqJkC4}4EJ(Hi$5$qHW6q$gQu&X%Q~loCIBUHT?7CC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/medkit_r.png b/Resources/Textures/Objects/medkit_r.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b9b34102a26066c55bd5ab810ae155e722809a4
GIT binary patch
literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq000{R000#T1^@s6x89W{0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!MM*?KRCwBA{Qv(y10kTVuTN0X#fuji
z38`V3%8pQT>pugAp$9be7>*x5&cMaRh0~C4-@btz<Z%5GhMXEB1Ka`@bc@QFApGio
z3=FM6_EA<=hMoIPF>G4B0H<Ysp$QDEKy@&^FwprAVlK==7Icd~1L>bY{1qtj2Bd(6
zh2hA7oec9AqFVOs#alSLwWS5D?hTqFK;|J^$bxPW3~-~xKw^9XPM>k{3St$1`XALo
z#ynPr{~!U71Ro>BS0K<2R8YvoKoR%}O#z@}F&AhaPUF7*XP`P@LFTYQ@n2Z*P-r;F
zN1y&<u?!T1XP^>)pkk+~;5%(bES6mY8q5QvMUWJ#P+-X~ApQizSN|g{WO@D{k_r`&
ze8_->O>P2FL65WdKtV1>h~yq1e()cWbgz?X5i<}QFhD%A8<-M7o??MX97c+thd_2I
zFr7Xo(%|^F-@x=jVMLMwC9<<n_DP_5>_D378jeH&a?x`Vd~*2uQ{s}oCeUSXkQ5)Z
zQe`j$iv7f4z&#sP6d%EW(vjOJ@-Y5VO=$)T0WL&pJaH4#U~FO_Acn_BAU$Ge`fY)h
zfdHd6GsFM+z(_lVq~RbiLNl0%PaGg0fGtUOz$(8BXx`ob(BkS25Who;J9%KroB>qe
zLS)j%6#@)s=7N0&Vz>aU6$a8mj0oS=Fr%hYQUS;!P(`%oAJj5Xvp|Q15p1M6Qn7sU
zA1a?*a1v^fxQ#s{*s`;iZZX6gsnejGhk$|wn;DnS>0tl}FaWMd-noC9>J9(^002ov
JPDHLkV1i4<9u@!q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/mop.png b/Resources/Textures/Objects/mop.png
new file mode 100644
index 0000000000000000000000000000000000000000..90ba32607e8e963972c1c2755cf770eb7689c95c
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*8>L*#K*_qxOuy^z1uYY
zSZK|ylIgFFta5Gu6)=_r`2{mLJiCzw<fM4IIEH9UyxO;sx50piMRp3~362(4iN-_o
zIp5f|ZvM{|aBP~uq9><6|2^#@KlvJi7sJXu9H+%vs#p^L@1G#*_u!z?yK`NV4WS~!
z5&|6l3vS0|=7k*X6^i6uz`XqbWgUi7U*>S1cqn9~^jzW$&^`uFS3j3^P6<r_7uicA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/shoes.png b/Resources/Textures/Objects/shoes.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e6879e3538ece9bacba8f8fcc5276b138d2489f
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*h=_>D%gf8j$yr-l
zTUuIbYHG^L%KG{FNk~Y@TA!Z>RLNKp<QL4~@a#q!kmKX&;uxYaF*!k^tRXNU;N}ep
zPY0DFYnLoO%5W?-JcuhO$g8lCJEUaCl#-H)L##J!WA4~mS;Z_nz#0>CC$`~$pc=y#
hCMK4Q*HatW8Md9^EB5@s8v-<!!PC{xWt~$(698ROH){X@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/toolbox_r.png b/Resources/Textures/Objects/toolbox_r.png
new file mode 100644
index 0000000000000000000000000000000000000000..21e8ad6e0b5860fa258795187c48c76f01cfb41d
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*Z=?jConR;VrKp<AyLf0
za9c)ZJrmPuCMG>Sy?IPb%a<>=_uo_kRLocs<QL4~@a#q!kW=UB;uxYaF*!jZ#vvd;
zp!NKUoE((~9R-$<g&hwz?cmtCV~57B9S2zEOqt^3>^ybK9GL}NQx+WXWmTLoZOM`)
z@7S(Bo;GdTwTo;jF(C;|GmUp!rJtMgavhU-@XE!SCMG<Q3@leJupYV-9KaHC_>PRg
nwg$#COZ5yMI20*d6l7osVO4BpZJkmCbP0o}tDnm{r-UW|fOJzk

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/worktop_single.png b/Resources/Textures/Objects/worktop_single.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c486bb69619e6d43f943daa8dd84ca1a3c42838
GIT binary patch
literal 517
zcmeAS@N?(olHy`uVBq!ia0vp^4nS<r!2%?IiLf~WDVB6cUm(4)ujY5)WFTK5*(1o8
zfuWtBfuRS8{{l5NIxsNQRx&WW>}FuFdCI^bd8XK=wH&CHDaqU2h2ejD|C#+j9%q3^
zWHAE+w-5+3Ub<WN2Pnv1;_2(k{*Xt8Pm9~;N<24E=!&O{V@Sl|x7RlE9x@PUeRyAE
zqQ*?7X&*SA^SPa1xY?kXVZ{8>hIh*qk0~YYf)j)~#b!U6%U*H+ZsfG)pA)M}Q$h`8
z9T*r{1h5lLm9Y-RYi$~Dayf0h;5zB&gTCa8dD{x>>T{CKyZelH{H$iuob>YZVwe9v
z9sT_Zw>62JEUDDl+GKO7mV@_>rnJ4F&=YHcGuLhSQy(w)`u+7M=QDNv!ms=0UM}Ih
z{psxf)ld27B>`<;V5N{FtM_ytQ}->)Jq&Z~7QJ0GbBYJhf2t*}5hW>!C8<`)MX5lF
z!N|bST-VS@*T^Eo(Adhv$jZ=A+rZGuz~KEA!5=6Za`RI%(<*UmnAf?|1*ky+WJ7R%
pT1k0gQ7S`0VrE{6US4X6f{C7io@r{UQ7TXkgQu&X%Q~loCIBxNsmcHV

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/copyright.txt b/Resources/Textures/Tiles/copyright.txt
new file mode 100644
index 0000000000..af5e976d6d
--- /dev/null
+++ b/Resources/Textures/Tiles/copyright.txt
@@ -0,0 +1,3 @@
+Alright because tiles don't use RSIs (yet) I gotta write this out.
+
+floor_steel.png taken from CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2
diff --git a/Resources/Textures/Tiles/floor_steel.png b/Resources/Textures/Tiles/floor_steel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebb183e5cb1d50e52ffb8eaf425f9cde32d56eac
GIT binary patch
literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*W#*rOB;Jtb<M=IEKN;K
zH8nNeAgg;oSzS*T#}JK)$q5Y%ZW?Eg9LV8e>j|i;;7s@tCLr38uu4M5Z@GVkhGT=)
clrTnyyaK223H~Mzff^Y+UHx3vIVCg!0KZZq*Z=?k

literal 0
HcmV?d00001

diff --git a/engine b/engine
index 71121f8fef..74705b5a66 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 71121f8fefe8f3f99b170b4fbf26f75ac30e9aa3
+Subproject commit 74705b5a6681af8290f3ee639f1632dc7001e58d