Skip to content

Commit

Permalink
Feat: Skull mecha paintkit
Browse files Browse the repository at this point in the history
  • Loading branch information
dj-34 committed Mar 9, 2024
1 parent 6b6ca2a commit ca7fd46
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 98 deletions.
55 changes: 22 additions & 33 deletions _maps/map_files220/generic/Lavaland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6903,10 +6903,6 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"zk" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/wall/indestructible/boss/see_through,
/area/lavaland/surface/outdoors/legion)
"zo" = (
/obj/structure/table,
/obj/item/kitchen/utensil/fork,
Expand Down Expand Up @@ -7231,14 +7227,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/outpost/catwalk)
"AM" = (
/obj/structure/window/reinforced/clockwork{
dir = 8;
move_resist = 45000
},
/obj/structure/stone_tile/slab,
/turf/simulated/floor/indestructible/boss,
/area/lavaland/surface/outdoors/legion)
"AN" = (
/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock";
Expand Down Expand Up @@ -8800,17 +8788,15 @@
/turf/simulated/floor/plating,
/area/mine/outpost/maintenance/south)
"Kr" = (
/obj/structure/stone_tile,
/obj/structure/stone_tile{
/obj/structure/stone_tile/block/cracked{
dir = 4
},
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/stone_tile{
/obj/structure/stone_tile/block{
dir = 8
},
/turf/simulated/wall/indestructible/boss,
/obj/structure/table/reinforced/brass,
/obj/item/paintkit/durand_skull,
/turf/simulated/floor/indestructible/boss,
/area/lavaland/surface/outdoors/legion)
"Ku" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
Expand Down Expand Up @@ -10716,6 +10702,9 @@
move_resist = 45000
},
/obj/structure/stone_tile/slab,
/obj/structure/bookcase{
move_resist = 45000
},
/turf/simulated/floor/indestructible/boss,
/area/lavaland/surface/outdoors/legion)
"Ww" = (
Expand Down Expand Up @@ -35224,7 +35213,7 @@ kM
kM
kM
kM
Kr
kM
kM
kM
kM
Expand Down Expand Up @@ -35481,7 +35470,7 @@ kM
kM
kM
yv
Ux
Kr
Av
kM
kM
Expand Down Expand Up @@ -43968,8 +43957,8 @@ nc
ng
kM
kM
fV
zk
kM
OZ
jl
gr
ah
Expand Down Expand Up @@ -44225,8 +44214,8 @@ hJ
id
kM
kM
fV
zk
kM
OZ
jm
jL
gM
Expand Down Expand Up @@ -49359,8 +49348,8 @@ kM
kM
kM
kM
kM
kM
fV
fV
Uf
Ut
yD
Expand Down Expand Up @@ -49617,7 +49606,7 @@ kM
kM
Bx
ED
kM
fV
jU
rY
hI
Expand Down Expand Up @@ -49874,7 +49863,7 @@ kM
LH
zQ
Ml
kM
fV
jU
MS
yS
Expand Down Expand Up @@ -50131,7 +50120,7 @@ Bx
yD
Wb
jU
kM
fV
Fs
kv
hI
Expand Down Expand Up @@ -50388,7 +50377,7 @@ kM
ui
HF
Jd
kM
fV
jU
Rn
hI
Expand Down Expand Up @@ -50645,7 +50634,7 @@ kM
kM
Bx
ED
kM
fV
yx
Hw
VM
Expand Down Expand Up @@ -53737,7 +53726,7 @@ Zb
xc
lt
MS
AM
ih
kM
kM
Yt
Expand Down
Binary file removed modular_ss220/mecha_skins/code/mecha.dmi
Binary file not shown.
8 changes: 4 additions & 4 deletions modular_ss220/mecha_skins/code/mecha_preloaded.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//GYGAX
// GYGAX

/obj/mecha/combat/gygax/nt
name = "Nanotrasen Special Gygax"
desc = "Козырь Nanotrasen при решении проблем, легкий мех окрашенный в победоносные цвета НТ. Если вы видите этот мех, вероятно все проблемы уже решены."
icon = 'modular_ss220/mecha_skins/code/mecha.dmi'
icon = 'modular_ss220/mecha_skins/icons/mecha.dmi'
icon_state = "ntgygax"
initial_icon = "ntgygax"
max_integrity = 300
Expand Down Expand Up @@ -46,12 +46,12 @@
/obj/mecha/combat/gygax/nt/add_cell()
cell = new /obj/item/stock_parts/cell/high/slime(src)

//DURAND
// DURAND

/obj/mecha/combat/durand/rover
desc = "Combat exosuit, developed by syndicate from the Durand Mk. II by scraping unnecessary things, and adding some of their tech. Much more protected from any Nanotrasen hazards."
name = "Rover"
icon = 'modular_ss220/mecha_skins/code/mecha.dmi'
icon = 'modular_ss220/mecha_skins/icons/mecha.dmi'
icon_state = "darkdurand"
initial_icon = "darkdurand"
armor = list(melee = 30, bullet = 40, laser = 50, energy = 50, bomb = 20, rad = 50, fire = 100, acid = 100)
Expand Down
Binary file removed modular_ss220/mecha_skins/code/paintkit.dmi
Binary file not shown.
Loading

0 comments on commit ca7fd46

Please sign in to comment.