Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions code/game/machinery/excelsior/ex_teleporter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,17 @@
/obj/item/stack/cable_coil/orange = list("amount" = 30, "price" = 30),
)
var/list/circuits = list(
/obj/item/electronics/circuitboard/excelsior_navigation_cracker = 2000, //
/obj/item/electronics/circuitboard/excelsior_turret = 50, //
/obj/item/electronics/circuitboard/autolathe_disk_cloner = 50, //
/obj/item/electronics/circuitboard/excelsiorreconstructor = 25, //
/obj/item/electronics/circuitboard/excelsior_autodoc = 25, //
/obj/item/electronics/circuitboard/excelsior_teleporter = 10, //
/obj/item/electronics/circuitboard/excelsiorautolathe = 10, //
/obj/item/electronics/circuitboard/excelsior_boombox = 10, //
/obj/item/electronics/circuitboard/diesel = 10, //
/obj/item/electronics/circuitboard/excelsiorreconstructor = 25, //
/obj/item/electronics/circuitboard/excelsiorshieldwallgen = 25, //
/obj/item/electronics/circuitboard/excelsior_autodoc = 25, //
/obj/item/electronics/circuitboard/excelsior_turret = 50, //
/obj/item/electronics/circuitboard/excelsior_navigation_cracker = 2000, //
/obj/item/electronics/circuitboard/excelsior_boombox = 10, //

)
var/list/excelsior_kits = list(
/* [?]"Factual" means how many energy we woulda spent for 1 material instead of 30. 1:1 cost in other words. [line 48]
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/excelsior/excelsior_items/KPK.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
var/mode = MODE_NONE
var/code_crutch = TRUE // TODO: DELETE IF STAGE 2 (drone update).
// - This is here cuz no drones yet, but I've decided it might be good to still include it.
matter = list(MATERIAL_PLASTIC = 5, MATERIAL_GLASS = 1, MATERIAL_PLASMA = 2)
matter = list() // lets not scrap this by accident

var/list/active_scanned = list()
var/datum/event_source
Expand Down
39 changes: 25 additions & 14 deletions code/game/objects/items/weapons/design_disks/excelsior.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Excelsior
/obj/item/computer_hardware/hard_drive/portable/design/excelsior
bad_type = /obj/item/computer_hardware/hard_drive/portable/design/excelsior
matter = list() // Excelsior can easily softlock themselves to the point the joke stops being funny.
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1)
spawn_tags = SPAWN_TAG_DESIGN_EXCELSIOR
icon_state = "excelsior"
Expand All @@ -13,37 +14,47 @@
spawn_blacklisted = TRUE
license = -1
designs = list(
/datum/design/autolathe/device/propaganda_chip,
/datum/design/autolathe/device/implanter,
/datum/design/autolathe/gun/reclaimer,
/datum/design/autolathe/circuit/autolathe_excelsior, //circuits
/datum/design/autolathe/circuit/shieldgen_excelsior,
/datum/design/autolathe/circuit/reconstructor_excelsior,
/datum/design/autolathe/circuit/diesel_excelsior,
/datum/design/autolathe/circuit/excelsior_boombox,
/datum/design/autolathe/circuit/turret_excelsior,
/datum/design/autolathe/circuit/autolathe_disk_cloner,

/datum/design/research/item/part/basic_capacitor,
/datum/design/research/item/part/micro_mani, //machine parts
/datum/design/research/item/part/micro_mani,
/datum/design/research/item/part/basic_matter_bin,
/datum/design/research/item/part/basic_micro_laser,
/datum/design/research/item/part/basic_sensor,

/datum/design/research/item/part/subspace_amplifier,
/datum/design/research/item/part/subspace_crystal,
/datum/design/research/item/part/subspace_transmitter,
/datum/design/autolathe/part/igniter, //regular parts

/datum/design/autolathe/part/igniter,
/datum/design/autolathe/part/signaler,
/datum/design/autolathe/part/door_signaler,

/datum/design/autolathe/part/sensor_prox,
/datum/design/autolathe/part/consolescreen,
/datum/design/autolathe/cell/large/excelsior, //power cells
//power cells
/datum/design/autolathe/cell/large/excelsior,
/datum/design/autolathe/cell/medium/excelsior,
/datum/design/autolathe/cell/small/excelsior,
/datum/design/autolathe/prosthesis/excelsior/l_arm, //prostheses
//prostheses
/datum/design/autolathe/prosthesis/excelsior/l_arm,
/datum/design/autolathe/prosthesis/excelsior/r_arm,
/datum/design/autolathe/prosthesis/excelsior/l_leg,
/datum/design/autolathe/prosthesis/excelsior/r_leg,
/datum/design/autolathe/prosthesis/excelsior/groin,
/datum/design/autolathe/prosthesis/excelsior/chest,
/datum/design/autolathe/prosthesis/excelsior/head,
/datum/design/autolathe/device/implanter, //misc
/datum/design/autolathe/device/propaganda_chip,
/datum/design/autolathe/container/ammocan_excel
// CIRCUITS (commented out)
// /datum/design/autolathe/circuit/autolathe_excelsior,
// /datum/design/autolathe/circuit/shieldgen_excelsior,
// /datum/design/autolathe/circuit/reconstructor_excelsior,
// /datum/design/autolathe/circuit/diesel_excelsior,
// /datum/design/autolathe/circuit/excelsior_boombox,
// /datum/design/autolathe/circuit/turret_excelsior,
// /datum/design/autolathe/circuit/autolathe_disk_cloner,
// MISC
)

/obj/item/computer_hardware/hard_drive/portable/design/excelsior/weapons
Expand Down
3 changes: 3 additions & 0 deletions code/modules/assembly/signaler.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/obj/item/device/assembly/signaler
name = "remote signaling device"
desc = "Used to remotely activate devices."

icon_state = "signaller"
item_state = "signaler"
item_icons = list(
Expand Down Expand Up @@ -192,6 +193,8 @@
/obj/item/device/assembly/signaler/door_controller
name = "remote door signaling device"
desc = "Used to remotely activate doors. 2 Beeps for opened, 1 for closed, 0 for no answer. Alt-Click to change Mode, Ctrl-Click to change code."
description_info = "You can use multitool on shutters and blast doors to change their codes, and you can assemble them yourself too!"
description_antag = "For a hack, unseal the doors by welding, then change their codes with multitool."
icon_state = "signaller"
item_state = "signaler"
origin_tech = list(TECH_MAGNET = 1)
Expand Down
Loading