things with stuff (#6233)
* buncha things from upstream * datums globals, onclick * datums * game folder, holy shit mirror bot why * modules * icons * dme * compiles cleanly * tools purge * updates maps * double check just because. and wew lad * incidentally, this needs more work first * some things * weh * sound cleanup and icons * reeeee * compile issues * oh look, fresh code sync * cleans up some unused icons * dirty vars * reeeeeeeeeeeeeeee * wew lad. fuck off with this already
This commit is contained in:
@@ -10,11 +10,8 @@
|
||||
var/admin_controlled
|
||||
var/no_destination_swap = 0
|
||||
|
||||
/obj/machinery/computer/shuttle/attack_hand(mob/user)
|
||||
if(..(user))
|
||||
return
|
||||
add_fingerprint(usr)
|
||||
|
||||
/obj/machinery/computer/shuttle/ui_interact(mob/user)
|
||||
. = ..()
|
||||
var/list/options = params2list(possible_destinations)
|
||||
var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
|
||||
var/dat = "Status: [M ? M.getStatusText() : "*Missing*"]<br><br>"
|
||||
|
||||
@@ -528,9 +528,6 @@
|
||||
else
|
||||
to_chat(usr, "The storage unit will only unlock during a Red or Delta security alert.")
|
||||
|
||||
/obj/item/storage/pod/attack_hand(mob/user)
|
||||
return MouseDrop(user)
|
||||
|
||||
/obj/docking_port/mobile/emergency/backup
|
||||
name = "backup shuttle"
|
||||
id = "backup"
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
icon_state = "wabbajack_statue"
|
||||
icon_state_on = "wabbajack_statue_on"
|
||||
active = FALSE
|
||||
allow_switch_interact = FALSE
|
||||
var/list/active_tables = list()
|
||||
var/tables_required = 2
|
||||
|
||||
@@ -40,10 +41,6 @@
|
||||
active = FALSE
|
||||
update_icon()
|
||||
|
||||
|
||||
/obj/machinery/power/emitter/energycannon/magical/attack_hand(mob/user)
|
||||
return
|
||||
|
||||
/obj/machinery/power/emitter/energycannon/magical/attackby(obj/item/W, mob/user, params)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user