Skip to content

Commit 922250e

Browse files
committed
Port Goliath
1 parent 4c117ad commit 922250e

40 files changed

+223
-15
lines changed

Resources/Prototypes/Entities/Clothing/Head/hoods.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@
173173
description: A hood of a goliath cloak, it is made from the hide of resilient fauna from a distant planet.
174174
components:
175175
- type: Sprite
176-
sprite: Clothing/Head/Hoods/goliathcloak.rsi
176+
sprite: SS220/Clothing/Head/Hoods/goliathcloak.rsi #SS220-goliathresprite
177177
- type: Clothing
178-
sprite: Clothing/Head/Hoods/goliathcloak.rsi
178+
sprite: SS220/Clothing/Head/Hoods/goliathcloak.rsi #SS220-goliathresprite
179179
- type: Tag
180180
tags:
181181
- WhitelistChameleon

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
description: A cloak made from the hide of resilient fauna from a distant planet, though its protective value has faded with its age.
161161
components:
162162
- type: Sprite
163-
sprite: Clothing/Neck/Cloaks/goliathcloak.rsi
163+
sprite: SS220/Clothing/Neck/Cloaks/goliathcloak.rsi #SS220-goliathresprite
164164
- type: ToggleableClothing
165165
clothingPrototype: ClothingHeadHatHoodGoliathCloak
166166
requiredSlot:

Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
description: A massive beast that uses long tentacles to ensnare its prey, threatening them is not advised under any conditions.
4040
components:
4141
- type: Sprite
42-
sprite: Mobs/Aliens/Asteroid/goliath.rsi
42+
sprite: SS220/Mobs/Aliens/Asteroid/goliath.rsi #SS220-goliathresprite
4343
layers:
4444
- map: ["enum.DamageStateVisualLayers.Base"]
4545
state: goliath
@@ -100,11 +100,11 @@
100100
- type: EntityWorldTargetAction
101101
raiseOnUser: true
102102
icon:
103-
sprite: Mobs/Aliens/Asteroid/goliath.rsi
104-
state: goliath_tentacle_spawn
103+
sprite: SS220\Interface\Actions\action_goliath.rsi #SS220-goliathresprite
104+
state: goliath_tentacles #SS220-goliathresprite
105105
iconOn:
106-
sprite: Mobs/Aliens/Asteroid/goliath.rsi
107-
state: goliath_tentacle_wiggle
106+
sprite: SS220\Interface\Actions\action_goliath.rsi #SS220-goliathresprite
107+
state: goliath_tentacles_on #SS220-goliathresprite
108108
sound:
109109
path: "/Audio/Weapons/slash.ogg"
110110
event: !type:GoliathSummonTentacleAction
@@ -122,7 +122,7 @@
122122
canCollide: true
123123
- type: InteractionOutline
124124
- type: Sprite
125-
sprite: Mobs/Aliens/Asteroid/goliath.rsi
125+
sprite: SS220/Mobs/Aliens/Asteroid/goliath_tentacle.rsi #SS220-goliathresprite
126126
layers:
127127
- state: goliath_tentacle_wiggle
128128
- type: StunOnContact
@@ -157,10 +157,10 @@
157157
bodyType: Static
158158
canCollide: false
159159
- type: Sprite
160-
sprite: Mobs/Aliens/Asteroid/goliath.rsi
160+
sprite: SS220/Mobs/Aliens/Asteroid/goliath_tentacle.rsi #SS220-goliathresprite
161161
- type: InteractionOutline
162162
- type: TimedDespawn
163-
lifetime: 0.7
163+
lifetime: 0.6 #SS220-goliathresprite
164164

165165
- type: entity
166166
id: EffectGoliathTentacleSpawn

Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@
340340
description: A slab of goliath meat. It's not very edible now, but it cooks great in lava.
341341
components:
342342
- type: Sprite
343+
sprite: SS220/Objects/Consumable/Food/meat.rsi #SS220-goliathresprite
343344
state: goliath
344345
- type: SolutionContainerManager
345346
solutions:
@@ -1063,8 +1064,12 @@
10631064
- Meat
10641065
- Steak
10651066
- type: Sprite
1066-
layers:
1067-
- state: goliath-cooked
1067+
#SS220-goliathresprite-begin
1068+
sprite: SS220/Objects/Consumable/Food/meat.rsi
1069+
state: goliath-cooked
1070+
#layers:
1071+
#- state: goliath-cooked
1072+
#SS220-goliathresprite-end
10681073
- type: SolutionContainerManager
10691074
solutions:
10701075
food:

Resources/Prototypes/Entities/Objects/Materials/materials.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@
762762
suffix: Full
763763
components:
764764
- type: Sprite
765-
sprite: Objects/Materials/hide.rsi
765+
sprite: SS220/Objects/Materials/hide.rsi #SS220-goliathresprite
766766
layers:
767767
- state: goliath_hide
768768
map: [ "base" ]
@@ -781,7 +781,7 @@
781781
- type: Item
782782
size: Large
783783
heldPrefix: goliathhide
784-
sprite: Objects/Materials/hide.rsi
784+
sprite: SS220/Objects/Materials/hide.rsi #SS220-goliathresprite
785785
shape:
786786
- 0,0,2,2
787787

Loading
Loading
Loading
Loading
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprited for 220 by NightmareStalker (github), color edited by EstKemran (GitHub) for SS220",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "icon"
12+
},
13+
{
14+
"name": "equipped-HELMET",
15+
"directions": 4
16+
},
17+
{
18+
"name": "equipped-HELMET-hamster",
19+
"directions": 4
20+
},
21+
{
22+
"name": "equipped-HELMET-vox",
23+
"directions": 4
24+
},
25+
{
26+
"name": "inhand-left",
27+
"directions": 4
28+
},
29+
{
30+
"name": "inhand-right",
31+
"directions": 4
32+
}
33+
]
34+
}
Loading
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from TGstation https://github.com/tgstation/tgstation/blob/HEAD/icons/mob/clothing/suits/armor.dmi, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by EstKemran (Github) for SS220",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "icon"
12+
},
13+
{
14+
"name": "equipped-NECK",
15+
"directions": 4
16+
},
17+
{
18+
"name": "inhand-left",
19+
"directions": 4
20+
},
21+
{
22+
"name": "inhand-right",
23+
"directions": 4
24+
}
25+
]
26+
}
Loading
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from Paradise at https://github.com/ss220-space/Paradise/blob/HEAD/icons/mob/actions/actions.dmi",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "goliath_tentacles"
12+
},
13+
{
14+
"name": "goliath_dash"
15+
},
16+
{
17+
"name": "goliath_tentacles_on"
18+
},
19+
{
20+
"name": "goliath_dash_on"
21+
}
22+
]
23+
}
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from TG Station at https://github.com/tgstation/tgstation/blob/HEAD/icons/mob/simple/lavaland/lavaland_monsters.dmi",
5+
"size": {
6+
"x": 54,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "goliath",
12+
"directions": 4
13+
},
14+
{
15+
"name": "goliath_preattack",
16+
"directions": 4
17+
},
18+
{
19+
"name": "goliath_dead"
20+
}
21+
]
22+
}
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from TG Station at https://github.com/tgstation/tgstation/blob/HEAD/icons/mob/simple/lavaland/lavaland_monsters.dmi",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "goliath_tentacle_spawn",
12+
"delays": [
13+
[
14+
0.1,
15+
0.1,
16+
0.1,
17+
0.1,
18+
0.1,
19+
0.1,
20+
0.1
21+
]
22+
]
23+
},
24+
{
25+
"name": "goliath_tentacle_wiggle",
26+
"delays": [
27+
[
28+
0.1,
29+
0.1,
30+
0.1,
31+
0.1,
32+
0.1,
33+
0.1,
34+
0.1
35+
]
36+
]
37+
},
38+
{
39+
"name": "goliath_tentacle_retract",
40+
"delays": [
41+
[
42+
0.1,
43+
0.1,
44+
0.1,
45+
0.1,
46+
0.1,
47+
0.1,
48+
0.1
49+
]
50+
]
51+
}
52+
]
53+
}
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from TG Station at https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/food/meat.dmi",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "goliath"
12+
},
13+
{
14+
"name": "goliath-cooked"
15+
}
16+
]
17+
}
Loading
Loading
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "Taken from TG Station at https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/stack_objects.dmi. Inhands by mubururu_ (github).",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "goliath_hide"
12+
},
13+
{
14+
"name": "goliathhide-inhand-left",
15+
"directions": 4
16+
},
17+
{
18+
"name": "goliathhide-inhand-right",
19+
"directions": 4
20+
},
21+
{
22+
"name": "goliath_hide_2"
23+
},
24+
{
25+
"name": "goliath_hide_3"
26+
}
27+
]
28+
}

0 commit comments

Comments
 (0)