cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-09 21:43:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

More map stuff, groundwork for job specific things and new explorer gear

Browse Source
This commit is contained in:
AnalWerewolf
2019-07-30 02:47:03 +10:00
parent 2006ed47c0
commit 5b696ea7bc
16 changed files with 231 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/clothing/suits/hooded.dm
View File

@@ -158,6 +158,30 @@
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/miner
/obj/item/clothing/suit/storage/hooded/explorer
name = "explorer suit"
desc = "An armoured suit for exploring harsh environments."
icon_state = "explorer"
item_state = "explorer"
flags = THICKMATERIAL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hood/explorer
siemens_coefficient = 0.9
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection.
allowed = list(
/obj/item/device/flashlight,
/obj/item/weapon/gun,
/obj/item/ammo_magazine,
/obj/item/weapon/melee,
/obj/item/weapon/material/knife,
/obj/item/weapon/tank,
/obj/item/device/radio,
/obj/item/weapon/pickaxe,
/obj/item/weapon/gun/projectile/sec/flash
)
/obj/item/clothing/suit/storage/hooded/explorer
name = "explorer suit"
desc = "An armoured suit for exploring harsh environments."

BIN
maps/rift/icons/mob/rft_hood.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
maps/rift/icons/mob/rft_suit.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
maps/rift/icons/mob/species/teshari/rft_suit.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 680 B

BIN
maps/rift/icons/mob/species/teshari/rft_uniform.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 738 B

BIN
maps/rift/icons/obj/rft_accessory.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 380 B

BIN
maps/rift/icons/obj/rft_hood.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

BIN
maps/rift/icons/obj/rft_suit.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 551 B

BIN
maps/rift/icons/obj/rft_weapons.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 677 B

76
maps/rift/items/clothing/rft_accessory.dm Normal file
View File

@@ -0,0 +1,76 @@
// Thermal suit armor
/obj/item/clothing/accessory/armor/armorplate/thermal_light
name = "light armor insert kit"
desc = "A kit of basic kevlar inserts. The inserts are light and flexible enough as to not impede movement. Inserts into a Hazardous Environment Suit."
icon_state = "armor_kit"
icon_override = null
icon = 'maps/rift/icons/obj/rft_accessory.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 25, bullet = 20, laser = 20, energy = 10, bomb = 25, bio = 0, rad = 40)
slot = ACCESSORY_SLOT_ARMOR_C
/obj/item/clothing/accessory/armor/armorplate/thermal_medium
name = "medium armor insert kit"
desc = "A kit of plasteel-reinforced synthetic inserts. The inserts aren't flexible, but aren't too heavy either, installing these may only impede movement slightly. Inserts into a Hazardous Environment Suit."
icon_state = "armor_kit"
icon_override = null
icon = 'maps/rift/icons/obj/rft_accessory.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 40, bullet = 40, laser = 40, energy = 25, bomb = 30, bio = 0, rad = 60)
slot = ACCESSORY_SLOT_ARMOR_C
slowdown = 0.25
/obj/item/clothing/accessory/armor/armorplate/thermal_heavy
name = "heavy armor insert kit"
desc = "A kit of plasteel-reinforced ceramic plates. The inserts are very heavy, thick, and not at all flexible. Installing these will impede movement a lot. Inserts into a Hazardous Environment Suit."
icon_state = "armor_kit"
icon_override = null
icon = 'maps/rift/icons/obj/rft_accessory.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 60, bullet = 60, laser = 60, energy = 30, bomb = 40, bio = 0, rad = 60)
slot = ACCESSORY_SLOT_ARMOR_C
slowdown = 1
/obj/item/clothing/accessory/armor/armorplate/thermal_riot
name = "blunt force insert kit"
desc = "An advanced kit of shear thickening reactive armor and polymer inserts to specifically protect the user against blunt trauma. These inserts are flexible but somewhat hefty, installing these may only impede movement slightly. Inserts into a Hazardous Environment Suit."
icon_state = "armor_kit"
icon_override = null
icon = 'maps/rift/icons/obj/rft_accessory.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 80, bullet = 20, laser = 10, energy = 10, bomb = 30, bio = 0, rad = 20)
slot = ACCESSORY_SLOT_ARMOR_C
slowdown = 0.25
/obj/item/clothing/accessory/armor/armorplate/thermal_bulletproof
name = "bullet resistant insert kit"
desc = "An advanced kit of shear thickening reactive armor and plasteel-reinforced synthetic weave inserts to specifically protect the user against bullet impacts and the resulting blunt force. These inserts are flexible but somewhat hefty, installing these may only impede movement slightly. Inserts into a Hazardous Environment Suit."
icon_state = "armor_kit"
icon_override = null
icon = 'maps/rift/icons/obj/rft_accessory.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 20, bullet = 80, laser = 10, energy = 10, bomb = 30, bio = 0, rad = 20)
slot = ACCESSORY_SLOT_ARMOR_C
slowdown = 0.25
/obj/item/clothing/accessory/armor/armorplate/thermal_ablative
name = "ablative insert kit"
desc = "An advanced kit of ablative, heat dissipating reactive armor and light synthetic weave inserts to specifically protect the user against laser based weaponry and partially from incoming energy soureces. A warning label on the kit states that because of how the inserts are installed, it cannot reflect projectiles. The inserts are quite hefty and not at all flexible. Installing these will impede movement a fair bit. Inserts into a Hazardous Environment Suit."
icon_state = "armor_kit"
icon_override = null
icon = 'maps/rift/icons/obj/rft_accessory.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 10, bullet = 10, laser = 80, energy = 40, bomb = 10, bio = 0, rad = 20)
slot = ACCESSORY_SLOT_ARMOR_C
slowdown = 0.5
/obj/item/clothing/accessory/armor/armorplate/thermal_rad
name = "CBRN insert kit"
desc = "An advanced kit of chemical, biological, radiation, and nuclear agent resistant lining designed to protect your vitals at the very least. The lining is lightly armored, but mainly intended to protect the user from more hazardous environments. A voidsuit would probably be better. These inserts won't slow you down one bit. Inserts into a Hazardous Environment Suit."
icon_state = "armor_kit"
icon_override = null
icon = 'maps/rift/icons/obj/rft_accessory.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 15, bullet = 15, laser = 15, energy = 30, bomb = 30, bio = 20, rad = 90) // Doesn't protect the head.
slot = ACCESSORY_SLOT_ARMOR_C

12
maps/rift/items/clothing/rft_hood.dm Normal file
View File

@@ -0,0 +1,12 @@
// Thermal suit hoods
/obj/item/clothing/head/hood/medical/sar_thermal
name = "search and rescue thermal hood"
desc = "A thick hazardous environment suit hood lined with synthetic fur and aerogels for retaining as much body heat as possible. Doesn't accept armor inserts like the rest of it's attached suit, however it is fitted with a light synthetic weave to make up for it."
icon_state = "sar_thermal"
item_icons = list(slot_head_str = 'maps/rift/icons/mob/rft_hood.dmi')
icon = 'maps/rift/icons/obj/rft_hood.dmi'
flags = THICKMATERIAL
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.9
armor = list(melee = 25, bullet = 20, laser = 20, energy = 10, bomb = 25, bio = 80, rad = 40)

28
maps/rift/items/clothing/rft_suit.dm Normal file
View File

@@ -0,0 +1,28 @@
// Thermal suits
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar_thermal
name = "search and rescue thermal suit"
desc = "A hefty hazardous environment suit lined with synthetic fur and aerogels for retaining as much body heat as possible. A blue star of life is emblazoned on the back, with the words search and rescue written underneath."
icon_state = "sar_thermal"
item_icons = list(slot_wear_suit_str = 'maps/rift/icons/mob/rft_suit.dmi')
icon = 'maps/rift/icons/obj/rft_suit.dmi'
flags = THICKMATERIAL
flags_inv = HIDEHOLSTER
hoodtype = /obj/item/clothing/head/hood/medical/sar_thermal
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
siemens_coefficient = 0.9
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 80, rad = 0)
valid_accessory_slots = (ACCESSORY_SLOT_INSIGNIA|ACCESSORY_SLOT_ARMOR_C)
allowed = list(
/obj/item/device/flashlight,
/obj/item/weapon/gun,
/obj/item/ammo_magazine,
/obj/item/weapon/melee,
/obj/item/weapon/material/knife,
/obj/item/weapon/tank,
/obj/item/device/radio,
/obj/item/weapon/pickaxe,
/obj/item/weapon/gun/projectile/sec/flash
)

27
maps/rift/items/clothing/rft_under.dm Normal file
View File

@@ -0,0 +1,27 @@
//Pilot
/obj/item/clothing/under/rank/pilot1
name = "\improper NanoTrasen flight suit"
desc = "A blue and grey NanoTrasen flight suit. Warm and practical, it feels cozy."
icon_state = "pilot1"
worn_state = "pilot1"
item_icons = list(slot_w_uniform_str = 'maps/southern_cross/icons/mob/sc_under.dmi')
icon = 'maps/southern_cross/icons/obj/sc_uniforms.dmi'
sprite_sheets = list(
"Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi'
)
starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1)
/obj/item/clothing/under/rank/pilot2
name = "\improper NanoTrasen flight suit"
desc = "A dark blue NanoTrasen flight suit. Warm and practical, seveal patches are scattered across it."
icon_state = "pilot2"
worn_state = "pilot2"
rolled_down = 0
rolled_sleeves = 0
item_icons = list(slot_w_uniform_str = 'maps/southern_cross/icons/mob/sc_under.dmi')
icon = 'maps/southern_cross/icons/obj/sc_uniforms.dmi'
sprite_sheets = list(
"Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi'
)
starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot2)

51
maps/rift/items/weapons/rft_weapons.dm Normal file
View File

@@ -0,0 +1,51 @@
// Pathfinder's machete
/obj/item/weapon/melee/energy/machete
name = "energy machete"
desc = "Light, concealable and especially favoured for artic survival, it features a sleek, robust design. While stylish, it is not the most practical and it somehow manages to look and feel like a toy. Features a telescoping energy emitter designed to be collapsed for storage."
icon_state = "machete0"
item_icons = list(slot_r_hand_str = 'maps/rift/icons/mob/rft_weapons.dmi', slot_l_hand_str = 'maps/rift/icons/mob/rft_weapons.dmi')
icon = 'maps/rift/icons/obj/rft_weapons.dmi'
active_force = 28
active_throwforce = 20
active_w_class = ITEMSIZE_LARGE
force = 3
throwforce = 5
throw_speed = 1
throw_range = 7
w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 2 , TECH_MATERIAL = 3)
var/active_state = "machete"
/obj/item/weapon/melee/energy/machete/initialize()
..()
lcolor = "#FF0000"
/obj/item/weapon/melee/energy/machete/activate(mob/living/user)
if(!active)
to_chat(user, "<span class='notice'>\The [src] is now energised.</span>")
..()
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
icon_state = "[active_state]"
/obj/item/weapon/melee/energy/machete/deactivate(mob/living/user)
if(active)
to_chat(user, "<span class='notice'>\The [src] deactivates!</span>")
..()
attack_verb = list()
icon_state = initial(icon_state)
/obj/item/weapon/melee/energy/machete/dropped(var/mob/user)
..()
if(!istype(loc,/mob))
deactivate(user)
/obj/item/weapon/melee/energy/machete/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(active && default_parry_check(user, attacker, damage_source) && prob(25))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
return 1
return 0

14
maps/rift/rift-01-underground2.dmm
View File

@@ -581,7 +581,7 @@
"li" = (/obj/structure/window/reinforced,/obj/machinery/computer/station_alert{icon_state = "computer"; dir = 8},/turf/simulated/floor/tiled/steel_ridged,/area/engineering/atmos)
"lj" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{icon_state = "intact"; dir = 5},/turf/simulated/wall/r_wall,/area/engineering/atmos)
"lk" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{icon_state = "intact"; dir = 10},/turf/simulated/wall/r_wall,/area/engineering/atmos)
"ll" = (/obj/structure/cable{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 6},/obj/structure/bed/chair/sofa/left,/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"ll" = (/obj/structure/cable{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 6},/obj/structure/bed/chair/sofa/right,/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"lm" = (/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 9},/turf/simulated/floor/tiled,/area/engineering/atmos)
"ln" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/engineering/atmos)
"lo" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 6},/turf/simulated/floor/tiled,/area/engineering/atmos)
@@ -726,7 +726,7 @@
"nX" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"nY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{icon_state = "map-scrubbers"; dir = 1},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"nZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/firealarm{pixel_y = 24},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"oa" = (/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/structure/bed/chair/sofa/right,/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"oa" = (/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/structure/bed/chair/sofa/left,/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"ob" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/camera/network/engineering{icon_state = "camera"; dir = 6},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"oc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"od" = (/obj/structure/catwalk,/obj/machinery/door/airlock/maintenance/common,/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
@@ -737,6 +737,7 @@
"oi" = (/obj/machinery/atmospherics/pipe/simple/visible/supply,/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/structure/catwalk,/obj/machinery/door/airlock/maintenance/common,/obj/machinery/door/firedoor/glass,/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/atmos_control)
"oj" = (/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/substation/atmos)
"ok" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/turf/simulated/floor/tiled,/area/engineering/atmos)
"ol" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/structure/bed/chair/sofa/right,/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"om" = (/obj/machinery/atmospherics/pipe/simple/visible/supply,/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/structure/catwalk,/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/atmos_control)
"on" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/plating,/area/maintenance/substation/atmos)
"oo" = (/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/substation/atmos)
@@ -758,6 +759,7 @@
"oE" = (/obj/machinery/atmospherics/unary/freezer{icon_state = "freezer_0"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos)
"oF" = (/obj/machinery/atmospherics/unary/heater{icon_state = "heater_0"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos)
"oG" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 9},/turf/simulated/floor/tiled,/area/engineering/atmos)
"oH" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 10},/obj/structure/cable{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/obj/structure/bed/chair/sofa/left,/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"oI" = (/obj/structure/catwalk,/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
"oJ" = (/obj/structure/catwalk,/obj/structure/cable{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
"oK" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/random/mob/mouse,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
@@ -840,7 +842,7 @@
"qj" = (/obj/machinery/camera/network/engineering{icon_state = "camera"; dir = 5},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"qk" = (/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"ql" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 8},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"qm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/structure/bed/chair/sofa/left,/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"qm" = (/obj/machinery/atmospherics/omni/mixer{name = "Gas Mixer"; tag_east = 1; tag_east_con = 0.5; tag_north = 2; tag_north_con = null; tag_south = 0; tag_south_con = null; tag_west = 1; tag_west_con = 0.5},/turf/simulated/floor/tiled,/area/engineering/atmos)
"qn" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 4},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"qo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{icon_state = "map-scrubbers"; dir = 4},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"qp" = (/obj/structure/cable{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/engineering/atmos)
@@ -856,7 +858,6 @@
"qz" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{icon_state = "map-scrubbers"; dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/atmos)
"qA" = (/obj/effect/floor_decal/techfloor,/obj/machinery/status_display{pixel_y = -32},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"qB" = (/obj/structure/table/rack,/obj/structure/bedsheetbin,/obj/item/weapon/storage/fancy/candle_box,/obj/effect/floor_decal/techfloor,/obj/machinery/status_display{pixel_y = -32},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"qC" = (/obj/machinery/atmospherics/omni/mixer,/turf/simulated/floor/tiled,/area/engineering/atmos)
"qD" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{icon_state = "intact"; dir = 5},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
"qE" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4},/obj/machinery/meter,/turf/simulated/floor/tiled,/area/engineering/atmos)
"qF" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan,/turf/simulated/floor/tiled,/area/engineering/atmos)
@@ -889,7 +890,6 @@
"rh" = (/obj/structure/cable{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"ri" = (/obj/machinery/door/airlock/maintenance/common,/obj/structure/catwalk,/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"rj" = (/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 4; dir = 2; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"rk" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 10},/obj/structure/cable{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/obj/structure/bed/chair/sofa/right,/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"rl" = (/obj/structure/table/reinforced,/obj/structure/flora/pottedplant/thinbush{pixel_y = 14},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"rm" = (/obj/structure/bed/chair/comfy/black{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
"rn" = (/obj/structure/bed/chair/comfy/black{icon_state = "comfychair_preview"; dir = 8},/turf/simulated/floor/tiled/steel,/area/hallway/primary/central_one{name = "\improper Central Primary Hallway - Underground Two"})
@@ -1028,7 +1028,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamsmsmsmsmsmsmsmsmsmsmsmsnHrgnbnznznbnurLjoacaeaeaeacjorMntnbnznznbnAnkmsmsmsmsmsmsmsmsmsmsmsmsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamsoQpapapapapapapapapafWpmrhnbnFnFnbnurLjoacaeaeaeacjorMntnbnFnFnbnAnGaomumumumumumumumumumumsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamspomsmsmsmsmsmsmsmsmsmsmsrinbnbnbnbnIrNjoacafafafagjorOnJnbnbnbnbpxmsmsmsmsmsmsaomsmsmsmsmumsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamspomsgelloagvgvgvgvgvgkjKrjnLgvgvgvnNrPbknQnRnSnTnUnVrQnYnXnXnXobphnZjOnXnXnXnXnXqmrkrlmsmumsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamspomsgelloagvgvgvgvgvgkjKrjnLgvgvgvnNrPbknQnRnSnTnUnVrQnYnXnXnXobphnZjOnXnXnXnXnXoloHrlmsmumsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamspomsrmpLpOasasasasasasaspRasasasasqeasasasasaVasasasasqeasasasaspRasasasasasasasqfqgrnmsmumsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWaWodaWjVqhasasqicsktktcsaXbbbbbdbebfbfbgbhktbmbGbHktbhbidtdtdGeweGeGhVcsktktcsqjasasocpQmsmumsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWidoejNasqkqlasasofcrqrkticicicpSjPjQasjRktktkucNkuktktjSasjTjUpTjWjWjWktrocrofasasqnqoasmsmurprqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -1041,7 +1041,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWkfoeayayozayayayaygZhnpXpYpZpZpZpZqainqbqccseDcteEcsqwqxqDqEqFqFqFqFqGiSiSjcbjbjbjbjbjbjbjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWkfhHoIoIoJkjcsqHkWlmcrcrcrcrcrcrcrcrcreHhoeJeKeLeMhWqIeOePeQeReReReReScrcriRlQqJcsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWkkklkmknihkocsqKcrjvjgjhjhjhjijhjhjhjijjhpjljmigjCfbqLfcfdeQfeeReReRffeReScrcrqKcsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWaWaWkkkfihkpcsqMfidYfjdYfkdYfjdYflfmfnfohGfqqChmfrfsqNfufvfmfwfmfxcrfyeRfzcrfAqOcsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWaWaWkkkfihkpcsqMfidYfjdYfkdYfjdYflfmfnfohGfqqmhmfrfsqNfufvfmfwfmfxcrfyeRfzcrfAqOcsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWkqoKihkrcsfCfDfEfFfGfDfHfFfIfDfJfFfKibfMdYhwfOfPqPfRfDfSfTfUfYfZfTgagbgcgdggcsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWaWaWaWaWkskfihkvcscsghdNgicsghdNgicsghdNgicsiicrcrhxgmcrqQcsghdNgicsghdNgicsgndNgncscsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWkkkwoLkxkxkyihkpkzcsgogpgqcsgrgsgtcsgugwgxcsildsqRqSqTqUqVcsgzgAgBcsgCgDgEcsgFgGgRcsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

6
maps/rift/rift.dm
View File

@@ -16,6 +16,12 @@
#include "rift-03-surface1.dmm"
#include "rift-04-surface2.dmm"
#include "items/clothing/rft_suit.dm"
#include "items/clothing/rft_hood.dm"
#include "items/clothing/rft_under.dm"
#include "items/clothing/rft_accessory.dm"
#include "items/weapons/rft_weapons.dm"
#define USING_MAP_DATUM /datum/map/rift
#elif !defined(MAP_OVERRIDE)