Port a big blast door, add to ship

This commit is contained in:
Chompstation Bot
2021-07-10 23:49:57 +00:00
parent 58f6f5a71a
commit 1e95d78a1a
7 changed files with 183 additions and 67 deletions

View File

@@ -404,6 +404,13 @@
icon_state_closing = "closing"
icon_state = "closed"
/obj/machinery/door/blast/multi_tile/four_tile_ver_sec
icon = 'icons/obj/doors/1x4blast_vert_sec.dmi'
bound_height = 128
width = 4
dir = NORTH
autoclose = TRUE
/obj/machinery/door/blast/multi_tile/four_tile_ver
icon = 'icons/obj/doors/1x4blast_vert.dmi'
bound_height = 128
@@ -422,6 +429,13 @@
width = 2
dir = NORTH
/obj/machinery/door/blast/multi_tile/four_tile_hor_sec
icon = 'icons/obj/doors/1x4blast_hor_sec.dmi'
bound_width = 128
width = 4
dir = EAST
autoclose = TRUE
/obj/machinery/door/blast/multi_tile/four_tile_hor
icon = 'icons/obj/doors/1x4blast_hor.dmi'
bound_width = 128

View File

@@ -845,9 +845,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
return icon_override
//2: species-specific sprite sheets (skipped for inhands)
if(LAZYLEN(sprite_sheets))
if(LAZYLEN(sprite_sheets) && !inhands)
var/sheet = sprite_sheets[body_type]
if(sheet && !inhands)
if(sheet)
return sheet
//3: slot-specific sprite sheets

View File

@@ -7,7 +7,14 @@
slowdown = 0.5
siemens_coefficient = 0.5
species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI) //this thing can autoadapt
<<<<<<< HEAD
icon = 'icons/obj/clothing/suits_vr.dmi'
||||||| parent of 2dc1cdeefd... Merge pull request #11015 from VOREStation/Arokha/lorgblast
icon = 'icons/inventory/suit/item_vr.dmi'
=======
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
>>>>>>> 2dc1cdeefd... Merge pull request #11015 from VOREStation/Arokha/lorgblast
w_class = ITEMSIZE_NORMAL //the mark vii packs itself down when not in use, thanks future-materials
breach_threshold = 16 //Extra Thicc
resilience = 0.05 //Military Armor
@@ -109,7 +116,14 @@
species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI) //this thing can autoadapt too
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
siemens_coefficient = 0.5
<<<<<<< HEAD
icon = 'icons/obj/clothing/hats_vr.dmi'
||||||| parent of 2dc1cdeefd... Merge pull request #11015 from VOREStation/Arokha/lorgblast
icon = 'icons/inventory/head/item_vr.dmi'
=======
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
>>>>>>> 2dc1cdeefd... Merge pull request #11015 from VOREStation/Arokha/lorgblast
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED)
var/away_planes = null
plane_slots = list(slot_head)

View File

@@ -142,7 +142,14 @@
/obj/item/clothing/suit/space/void/autolok
name = "AutoLok pressure suit"
desc = "A high-tech snug-fitting pressure suit. Fits any species. It offers very little physical protection, but is equipped with sensors that will automatically deploy the integral helmet to protect the wearer."
<<<<<<< HEAD
icon = 'icons/obj/clothing/suits_vr.dmi'
||||||| parent of 2dc1cdeefd... Merge pull request #11015 from VOREStation/Arokha/lorgblast
icon = 'icons/inventory/suit/item_vr.dmi'
icon_override = 'icons/inventory/suit/mob_vr.dmi'
=======
icon = 'icons/inventory/suit/item_vr.dmi'
>>>>>>> 2dc1cdeefd... Merge pull request #11015 from VOREStation/Arokha/lorgblast
icon_state = "autoloksuit"
item_state = "autoloksuit"
item_state_slots = list(slot_r_hand_str = "space_suit_syndicate", slot_l_hand_str = "space_suit_syndicate")
@@ -152,6 +159,7 @@
species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt
breach_threshold = 6 //this thing is basically tissue paper
w_class = ITEMSIZE_NORMAL //if it's snug, high-tech, and made of relatively soft materials, it should be much easier to store!
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
/obj/item/clothing/suit/space/void/autolok
sprite_sheets = list(
@@ -226,11 +234,18 @@
/obj/item/clothing/head/helmet/space/void/autolok
name = "AutoLok pressure helmet"
desc = "A rather close-fitting helmet designed to protect the wearer from hazardous conditions. Automatically deploys when the suit's sensors detect an environment that is hazardous to the wearer."
icon = 'icons/inventory/head/item_vr.dmi'
icon_state = "autolokhelmet"
item_state = "autolokhelmet"
species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt too
<<<<<<< HEAD
icon = 'icons/obj/clothing/hats_vr.dmi'
||||||| parent of 2dc1cdeefd... Merge pull request #11015 from VOREStation/Arokha/lorgblast
icon = 'icons/inventory/head/item_vr.dmi'
=======
>>>>>>> 2dc1cdeefd... Merge pull request #11015 from VOREStation/Arokha/lorgblast
flags_inv = HIDEEARS|BLOCKHAIR //removed HIDEFACE/MASK/EYES flags so sunglasses or facemasks don't disappear. still gotta have BLOCKHAIR or it'll clip out tho.
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
/obj/item/clothing/head/helmet/space/void/autolok
sprite_sheets = list(

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

View File

@@ -26082,6 +26082,10 @@ Ua
},
/turf/simulated/floor/reinforced/airless,
/area/space)
"bF" = (
/obj/machinery/light/floortube,
/turf/simulated/floor/tiled/eris/dark/danger,
/area/aro3/repair_bay)
"bH" = (
/obj/structure/closet/walllocker/emerglocker/north{
dir = 8;
@@ -26628,6 +26632,12 @@ Ua
},
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
/area/aro3/power)
"gc" = (
/obj/machinery/light/floortube{
dir = 8
},
/turf/simulated/floor/tiled/eris/dark,
/area/aro3/surfluid)
"gd" = (
/turf/simulated/floor/wood,
/area/aro3/suite_port)
@@ -26999,8 +27009,18 @@ Ua
},
/turf/simulated/floor/tiled/eris/dark/panels,
/area/aro3/hallway_bunkrooms)
"iI" = (
/obj/structure/cable/cyan{
icon_state = "4-8"
},
/obj/machinery/light_switch{
pixel_x = -25;
pixel_y = 25
},
/turf/simulated/floor/tiled/eris/steel/bar_dance,
/area/aro3/bar)
"iJ" = (
/obj/structure/bed/chair/sofa/black{
/obj/structure/bed/chair/sofa/corp{
dir = 1
},
/turf/simulated/floor/tiled/eris/dark,
@@ -27091,8 +27111,8 @@ Ua
/turf/simulated/floor/tiled/eris/steel/panels,
/area/aro3/function)
"jh" = (
/obj/structure/bed/chair/sofa/black/corner{
dir = 4
/obj/structure/bed/chair/sofa/corp/corner{
dir = 1
},
/turf/simulated/floor/tiled/eris/dark,
/area/aro3/function)
@@ -27183,7 +27203,7 @@ Ua
/area/aro3/medical)
"ke" = (
/obj/structure/fans/hardlight,
/obj/machinery/door/blast/multi_tile/two_tile_hor{
/obj/machinery/door/blast/multi_tile/four_tile_hor_sec{
id = "aroshipshutter_ramp"
},
/turf/simulated/floor/reinforced,
@@ -27220,6 +27240,9 @@ Ua
/obj/structure/cable/cyan{
icon_state = "1-8"
},
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/carpet/turcarpet,
/area/aro3/suite_starboard)
"kl" = (
@@ -27399,6 +27422,15 @@ Ua
},
/turf/simulated/floor/wood,
/area/aro3/suite_starboard)
"lC" = (
/obj/structure/railing/grey{
dir = 4
},
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/water/indoors/surfluid,
/area/aro3/workshop)
"lI" = (
/obj/structure/cable/cyan{
icon_state = "1-2"
@@ -27485,10 +27517,8 @@ Ua
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/aro3/hallway_port)
"mG" = (
/obj/structure/closet/walllocker/emerglocker/north,
/obj/machinery/light_switch{
dir = 4;
pixel_x = -25
/obj/machinery/vending/boozeomat{
density = 0
},
/turf/simulated/floor/tiled/eris/steel/bar_dance,
/area/aro3/bar)
@@ -27575,7 +27605,7 @@ Ua
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
/area/aro3/power)
"nq" = (
/obj/structure/bed/chair/sofa/black/right{
/obj/structure/bed/chair/sofa/corp/right{
dir = 8
},
/turf/simulated/floor/tiled/eris/dark,
@@ -27931,10 +27961,10 @@ Ua
/area/aro3/workshop)
"qV" = (
/obj/machinery/light{
dir = 1
dir = 4
},
/turf/simulated/floor/plating/eris/under,
/area/aro3/power)
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
/area/aro3/hallway_port)
"qW" = (
/obj/structure/railing/grey{
dir = 4
@@ -28033,10 +28063,10 @@ Ua
/turf/simulated/floor/tiled/eris/dark/danger,
/area/aro3/flight_deck)
"rx" = (
/obj/structure/bed/chair/sofa/black/right{
/obj/machinery/light,
/obj/structure/bed/chair/sofa/corp/left{
dir = 1
},
/obj/machinery/light,
/turf/simulated/floor/tiled/eris/dark,
/area/aro3/function)
"rA" = (
@@ -28351,6 +28381,12 @@ Ua
},
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/aro3/hallway_port)
"uL" = (
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/plating/eris/under,
/area/aro3/power)
"uS" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -28750,11 +28786,10 @@ Ua
/turf/simulated/floor/tiled/eris/dark,
/area/aro3/power)
"xG" = (
/obj/structure/fans/hardlight,
/obj/structure/cable/cyan{
icon_state = "1-2"
},
/turf/simulated/floor/reinforced,
/turf/simulated/wall/rpshull,
/area/aro3/flight_deck)
"xI" = (
/obj/structure/flora/pottedplant/unusual,
@@ -28828,6 +28863,15 @@ Ua
},
/turf/simulated/floor/tiled/eris/dark/gray_platform,
/area/aro3/repair_bay)
"yx" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
landmark_tag = "aronai3_aftstbd";
name = "Aft and Starboard"
},
/turf/space,
/area/space)
"yy" = (
/obj/structure/cable/cyan{
icon_state = "1-2"
@@ -29005,6 +29049,9 @@ Ua
/obj/structure/cable/cyan{
icon_state = "2-4"
},
/obj/machinery/light/floortube{
dir = 4
},
/turf/simulated/floor/tiled/eris/dark,
/area/aro3/surfluid)
"zu" = (
@@ -29115,10 +29162,7 @@ Ua
/turf/simulated/floor/tiled/eris/steel/bar_dance,
/area/aro3/bar)
"zY" = (
/obj/machinery/vending/boozeomat{
density = 0;
pixel_y = 32
},
/obj/structure/closet/walllocker/emerglocker/north,
/turf/simulated/floor/tiled/eris/steel/bar_dance,
/area/aro3/bar)
"Aa" = (
@@ -29293,15 +29337,15 @@ Ua
/area/aro3/hallway_starboard)
"Bw" = (
/obj/structure/fans/hardlight,
/obj/machinery/door/blast/multi_tile/four_tile_hor{
id = "aroshipshutter_ramp"
},
/obj/machinery/button/remote/blast_door{
dir = 4;
id = "aroshipshutter_ramp";
name = "hangar shutters";
pixel_x = -28
},
/obj/machinery/door/blast/multi_tile/four_tile_hor_sec{
id = "aroshipshutter_ramp"
},
/turf/simulated/floor/reinforced,
/area/aro3/flight_deck)
"Bx" = (
@@ -29463,13 +29507,10 @@ Ua
/turf/simulated/floor/tiled/techmaint,
/area/aro3/hallway_bunkrooms)
"Di" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
landmark_tag = "aronai3_aftstbd";
name = "Aft and Starboard"
/obj/effect/floor_decal/industrial/warning/dust{
dir = 1
},
/turf/space,
/turf/simulated/floor/reinforced/airless,
/area/space)
"Dn" = (
/turf/space/internal_edge/left,
@@ -29496,12 +29537,14 @@ Ua
/turf/simulated/floor/tiled/eris/dark/gray_platform,
/area/aro3/hallway_bunkrooms)
"DA" = (
/obj/structure/fans/hardlight,
/obj/machinery/door/blast/multi_tile/four_tile_hor{
id = "aroshipshutter_ramp"
/obj/structure/cable/cyan{
icon_state = "1-2"
},
/turf/simulated/floor/reinforced,
/area/aro3/flight_deck)
/obj/effect/floor_decal/industrial/warning/dust{
dir = 1
},
/turf/simulated/floor/reinforced/airless,
/area/space)
"DB" = (
/obj/structure/cable/cyan{
icon_state = "2-8"
@@ -29522,7 +29565,7 @@ Ua
/turf/simulated/floor/tiled/eris/steel/panels,
/area/aro3/eva_hall)
"DQ" = (
/obj/structure/bed/chair/sofa/black/left{
/obj/structure/bed/chair/sofa/corp/left{
dir = 4
},
/turf/simulated/floor/tiled/eris/dark,
@@ -29599,6 +29642,12 @@ Ua
},
/turf/simulated/floor/carpet/turcarpet,
/area/aro3/suite_starboard)
"Ew" = (
/obj/machinery/alarm/alarms_hidden{
pixel_y = 26
},
/turf/simulated/floor/plating/eris/under,
/area/aro3/power)
"Ex" = (
/obj/machinery/computer/ship/navigation/telescreen{
pixel_y = 23
@@ -29930,6 +29979,12 @@ Ua
"Hv" = (
/turf/simulated/floor/bluegrid,
/area/space)
"Hw" = (
/obj/machinery/light/floortube{
dir = 1
},
/turf/simulated/floor/tiled/eris/dark,
/area/aro3/function)
"Hz" = (
/obj/structure/cable/cyan{
icon_state = "4-8"
@@ -29952,7 +30007,7 @@ Ua
/turf/space,
/area/space)
"HH" = (
/obj/structure/bed/chair/sofa/black{
/obj/structure/bed/chair/sofa/corp{
dir = 4
},
/turf/simulated/floor/tiled/eris/dark,
@@ -30027,6 +30082,7 @@ Ua
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/machinery/light/floortube,
/turf/simulated/floor/tiled/eris/dark/danger,
/area/aro3/workshop)
"IK" = (
@@ -30301,6 +30357,9 @@ Ua
/obj/machinery/clonepod/transhuman/full{
req_access = list()
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled/eris/white/cargo,
/area/aro3/medical)
"Lp" = (
@@ -30319,7 +30378,7 @@ Ua
/turf/simulated/floor/tiled/eris/white/cargo,
/area/aro3/medical)
"Ls" = (
/obj/structure/bed/chair/sofa/black/corner{
/obj/structure/bed/chair/sofa/corp/corner{
dir = 8
},
/turf/simulated/floor/tiled/eris/dark,
@@ -30535,6 +30594,9 @@ Ua
/obj/structure/cable/cyan{
icon_state = "1-4"
},
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/carpet/turcarpet,
/area/aro3/suite_port)
"Na" = (
@@ -30622,6 +30684,15 @@ Ua
},
/turf/simulated/floor/tiled/eris/dark/violetcorener,
/area/aro3/cockpit)
"NR" = (
/obj/structure/cable/cyan{
icon_state = "1-2"
},
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
/area/aro3/hallway_starboard)
"NU" = (
/obj/structure/table/steel,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -30635,6 +30706,7 @@ Ua
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/machinery/light,
/turf/simulated/floor/tiled/eris/white/cargo,
/area/aro3/medical)
"Ob" = (
@@ -30784,11 +30856,12 @@ Ua
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/machinery/light,
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
/area/aro3/hallway_bunkrooms)
"Px" = (
/obj/machinery/alarm/alarms_hidden{
pixel_y = 26
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/plating/eris/under,
/area/aro3/power)
@@ -30819,7 +30892,7 @@ Ua
/turf/simulated/floor/tiled/eris/white/golden,
/area/aro3/medical)
"PJ" = (
/obj/structure/bed/chair/sofa/black{
/obj/structure/bed/chair/sofa/corp{
dir = 8
},
/turf/simulated/floor/tiled/eris/dark,
@@ -31298,10 +31371,10 @@ Ua
/turf/simulated/wall/rpshull,
/area/aro3/flight_deck)
"Us" = (
/obj/structure/bed/chair/sofa/black/left{
/obj/machinery/light,
/obj/structure/bed/chair/sofa/corp/right{
dir = 1
},
/obj/machinery/light,
/turf/simulated/floor/tiled/eris/dark,
/area/aro3/function)
"Ut" = (
@@ -36260,7 +36333,7 @@ Ua
Ua
Ua
Ua
Ua
Lf
Ua
Ua
Ua
@@ -37106,7 +37179,7 @@ Ua
Ua
Ua
Ua
Lf
Ua
Ua
Ua
Ua
@@ -39792,10 +39865,10 @@ xj
uE
kH
aq
TW
uL
rP
Gs
TW
uL
aq
Fn
yn
@@ -40076,7 +40149,7 @@ aS
uE
XQ
aq
TW
Ew
wx
wx
TW
@@ -40218,7 +40291,7 @@ jV
ED
NV
aq
qV
TW
wW
RK
TW
@@ -40365,7 +40438,7 @@ ps
xa
TW
TW
TW
uL
aq
aq
aq
@@ -40891,7 +40964,7 @@ IT
hb
Xm
hU
Cv
qV
Cv
Ej
ZB
@@ -41460,7 +41533,7 @@ zu
uJ
dp
uJ
zu
Hw
qX
Fb
zu
@@ -41631,7 +41704,7 @@ Fr
NC
NC
ue
Is
bF
hi
Hn
NC
@@ -41791,8 +41864,8 @@ Ov
Ov
Ov
Ov
ke
hD
Ur
Di
hD
hD
Au
@@ -41934,7 +42007,7 @@ MA
MA
MA
xG
te
DA
te
te
sV
@@ -42057,7 +42130,7 @@ CH
NC
NC
cc
Is
bF
Is
Gt
NC
@@ -42075,7 +42148,7 @@ Ov
Ov
Ov
Ov
DA
ke
hD
hD
hD
@@ -42170,7 +42243,7 @@ zu
uJ
nW
uJ
zu
Hw
qX
Fb
zu
@@ -42190,7 +42263,7 @@ AD
RJ
vb
yk
yk
gc
yk
Kw
RJ
@@ -42737,7 +42810,7 @@ Hd
wF
uX
Yh
re
NR
re
bR
BX
@@ -43191,7 +43264,7 @@ WJ
ly
aY
ki
aY
lC
aY
ly
lq
@@ -43893,7 +43966,7 @@ Yj
LS
EV
mG
aO
iI
DH
Fx
YY
@@ -43908,7 +43981,7 @@ dO
Ym
tl
nm
NF
TM
fB
gG
ax
@@ -46762,7 +46835,7 @@ Ua
Ua
Ua
Ua
Di
Ua
Ua
Ua
Ua
@@ -47620,7 +47693,7 @@ Ua
Ua
Ua
Ua
Ua
yx
Ua
Ua
Ua