Commit dc96c984 authored by JMWTurner's avatar JMWTurner Committed by clusterfack
Browse files

Drone Ship Vault (#12433)

* mannequinvault

* revision 1

* revision 2
parent 31a66103
......@@ -53,6 +53,16 @@
attack_verb = list("attacks", "slashes", "stabs", "slices", "tears", "rips", "dices", "cuts")
/obj/item/weapon/melee/energy/sword/activated/New()
..()
active = 1
force = 30
w_class = W_CLASS_LARGE
sharpness = 1.5
hitsound = "sound/weapons/blade1.ogg"
update_icon()
/obj/item/weapon/melee/energy/sword/IsShield()
if(active)
return 1
......
......@@ -297,7 +297,7 @@
/obj/structure/mannequin/proc/getDamage(var/damage)
health -= damage
healthCheck()
if(health > 0 && trapped_strip || trapped_prox)
if(health > 0 && (trapped_strip || trapped_prox))
Awaken()
......@@ -743,7 +743,7 @@
if(tool.force >= livingMannequin.melee_damage_lower)
livingMannequin.melee_damage_lower = tool.force
livingMannequin.melee_damage_upper = tool.force
livingMannequin.attacktext = "swings its [tool] at"
livingMannequin.attacktext = "swings [tool] at"
if(tool.hitsound)
livingMannequin.attack_sound = tool.hitsound
if(firer)
......@@ -889,7 +889,7 @@
else
shield -= damage
healthCheck()
if(health > 0 && trapped_strip || trapped_prox)
if((destroyed || !locked) && health > 0 && (trapped_strip || trapped_prox))
Awaken()
/obj/structure/mannequin/cyber/blob_act()
......
......@@ -122,7 +122,7 @@
flags = FPRINT
force = 1
throwforce = 1
w_class = W_CLASS_MEDIUM
w_class = W_CLASS_SMALL
var/bullets = 10
var/max_bullets = 10
var/caliber = "osipr" //base icon name
......@@ -148,7 +148,7 @@
name = "pulse magazine"
desc = "Primary ammo for OSIPR. Can be replenished by a recharger."
icon_state = "osipr-magfull"
w_class = W_CLASS_MEDIUM
w_class = W_CLASS_SMALL
bullets = 30
max_bullets = 30
caliber = "osipr"
......@@ -165,7 +165,7 @@
flags = FPRINT
force = 1
throwforce = 1
w_class = W_CLASS_MEDIUM
w_class = W_CLASS_SMALL
/obj/item/osipr_core/New()
..()
......
......@@ -104,4 +104,7 @@ var/list/existing_vaults = list()
file_path = "maps/randomvaults/AIsat.dmm"
/datum/map_element/vault/ejectedengine
file_path = "maps/randomvaults/ejectedengine.dmm"
\ No newline at end of file
file_path = "maps/randomvaults/ejectedengine.dmm"
/datum/map_element/vault/droneship
file_path = "maps/randomvaults/droneship.dmm"
"a" = (/turf/space,/area)
"b" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 4; pixel_x = -24},/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/vault/droneship)
"c" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/vault/droneship)
"d" = (/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/vault/droneship)
"e" = (/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/vault/droneship)
"f" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/shuttle/plating/airless,/area/vault/droneship)
"g" = (/obj/item/robot_parts/l_arm,/turf/space,/area)
"h" = (/obj/item/stack/rods,/turf/space,/area)
"i" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/space,/area)
"j" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/item/weapon/shard,/obj/effect/decal/cleanable/soot,/turf/simulated/shuttle/plating/airless,/area/vault/droneship)
"k" = (/obj/effect/decal/cleanable/soot,/obj/effect/decal/cleanable/molten_item,/obj/machinery/computer/pod{id_tags = list("Cyber"); name = "Pod Door Control"},/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/droneship)
"l" = (/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/droneship)
"m" = (/obj/machinery/telecomms/receiver,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/greengrid{light_color = "#A9F291"; light_range = 2},/area/vault/droneship)
"n" = (/obj/item/trash/mannequin/large,/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/vault/droneship)
"o" = (/obj/structure/mannequin/cyber{mapping_hand_right = /obj/item/weapon/kitchen/utensil/knife/tactical},/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/vault/droneship)
"p" = (/obj/structure/mannequin/cyber/broken{mapping_hand_right = /obj/item/weapon/pickaxe/drill},/obj/item/weapon/shard,/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/vault/droneship)
"q" = (/obj/structure/mannequin/cyber{chaintrap_range = 10; locked = 1; mapping_hand_left = /obj/item/weapon/p_folded/ball/droneship; mapping_hand_right = /obj/item/weapon/melee/energy/sword/activated; trapped_strip = 1},/turf/simulated/floor/bluegrid{light_color = "#C9EBFE"; light_range = 2},/area/vault/droneship)
"r" = (/obj/structure/mannequin/cyber{mapping_hand_right = /obj/item/weapon/pickaxe/plasmacutter},/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/vault/droneship)
"s" = (/obj/structure/shuttle/engine/heater{dir = 1},/turf/space,/area)
"t" = (/obj/item/weapon/shard,/obj/structure/lattice,/turf/space,/area)
"u" = (/obj/effect/decal/cleanable/soot,/obj/item/weapon/storage/fancy/flares,/turf/simulated/shuttle/plating/airless,/area/vault/droneship)
"v" = (/obj/effect/decal/cleanable/soot,/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/droneship)
"w" = (/obj/effect/decal/cleanable/soot,/obj/item/robot_parts/r_leg,/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/droneship)
"x" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/vault/droneship)
"y" = (/obj/machinery/door/poddoor/glass{id_tag = "Cyber"; name = "Cyber-Pod lock"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/vault/droneship)
"z" = (/obj/machinery/door/poddoor/droneship,/turf/simulated/shuttle/plating/airless,/area/vault/droneship)
"A" = (/obj/item/weapon/gun/osipr{pixel_y = 8},/obj/item/energy_magazine/osipr{pixel_x = 8},/obj/item/energy_magazine/osipr{pixel_x = 8; pixel_y = -6},/obj/item/osipr_core{pixel_y = -4},/obj/item/osipr_core{pixel_x = -4; pixel_y = -4},/obj/item/osipr_core{pixel_x = -8; pixel_y = -4},/turf/simulated/floor/greengrid{light_color = "#A9F291"; light_range = 2},/area/vault/droneship)
"B" = (/obj/structure/lattice,/turf/space,/area)
"C" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/effect/decal/cleanable/soot,/turf/simulated/shuttle/plating/airless,/area/vault/droneship)
"D" = (/obj/effect/decal/cleanable/soot,/obj/effect/decal/remains/robot,/obj/structure/closet/fireaxecabinet{pixel_y = -28},/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/droneship)
"E" = (/obj/machinery/telecomms/broadcaster,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/greengrid{light_color = "#A9F291"; light_range = 2},/area/vault/droneship)
"F" = (/obj/structure/mannequin/cyber/broken{dir = 1},/obj/item/weapon/shard,/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/vault/droneship)
"G" = (/obj/item/trash/mannequin/large,/obj/effect/gibspawner/robot,/obj/item/weapon/shard,/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/vault/droneship)
"H" = (/obj/structure/mannequin/cyber/broken{dir = 1; mapping_hand_right = /obj/item/weapon/pickaxe},/obj/item/weapon/shard,/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/vault/droneship)
"I" = (/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/vault/droneship)
"J" = (/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/vault/droneship)
(1,1,1) = {"
aaaaaaaaaaabccdaaa
aaaaeccfcccccccdaa
gahaijklmcnopqrccd
asaatuvwxyxxxxxzAc
aaBaiCDlEcnFGHnccI
aaaaJccfcccccccIaa
aaaaaaaaaaabccIaaa
"}
......@@ -104,6 +104,45 @@
name = "\improper Engine Hallway"
icon_state = "engine"
/area/vault/droneship
name = "\improper Drone Ship"
requires_power = 1
jammed = 2
var/pod_code = "00000"
/area/vault/droneship/New()
..()
pod_code = "[rand(10000, 99999.0)]"
/obj/machinery/door/poddoor/droneship
name = "\improper OSIPR Pod-Door"
id_tag = "denied"
/obj/machinery/door/poddoor/droneship/New()
..()
var/area/A = get_area(src)
if(A && istype(A,/area/vault/droneship))
var/area/vault/droneship/DS = A
id_tag = DS.pod_code
/obj/item/weapon/p_folded/ball/droneship
name = "crushed ball of paper"
/obj/item/weapon/p_folded/ball/droneship/New()
..()
qdel(unfolded)
unfolded = new /obj/item/weapon/paper/crumpled/droneship(src)
/obj/item/weapon/paper/crumpled/droneship
name = "paper- 'OSIPR Pod-Door ID'"
info = "denied"
/obj/item/weapon/paper/crumpled/droneship/New()
var/area/A = get_area(src)
if(A && istype(A,/area/vault/droneship))
var/area/vault/droneship/DS = A
info = "[DS.pod_code]"
/mob/living/simple_animal/hostile/monster/cyber_horror/quiet
speak_chance = 1 //shut the fuck up
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment