and finally, the modules folder. Now I can publish and take a break
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
|
||||
|
||||
/obj/item/assault_pod
|
||||
name = "Assault Pod Targetting Device"
|
||||
name = "Assault Pod Targeting Device"
|
||||
icon = 'icons/obj/device.dmi'
|
||||
icon_state = "gangtool-red"
|
||||
item_state = "radio"
|
||||
|
||||
@@ -263,6 +263,14 @@
|
||||
|
||||
return has_people
|
||||
|
||||
/obj/docking_port/mobile/emergency/proc/ShuttleDBStuff()
|
||||
set waitfor = FALSE
|
||||
if(!SSdbcore.Connect())
|
||||
return
|
||||
var/datum/DBQuery/query_round_shuttle_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET shuttle_name = '[name]' WHERE id = [GLOB.round_id]")
|
||||
query_round_shuttle_name.Execute()
|
||||
qdel(query_round_shuttle_name)
|
||||
|
||||
/obj/docking_port/mobile/emergency/check()
|
||||
if(!timer)
|
||||
return
|
||||
@@ -293,9 +301,7 @@
|
||||
setTimer(SSshuttle.emergencyDockTime)
|
||||
send2irc("Server", "The Emergency Shuttle has docked with the station.")
|
||||
priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/ai/shuttledock.ogg', "Priority")
|
||||
if(SSdbcore.Connect())
|
||||
var/datum/DBQuery/query_round_shuttle_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET shuttle_name = '[name]' WHERE id = [GLOB.round_id]")
|
||||
query_round_shuttle_name.Execute()
|
||||
ShuttleDBStuff()
|
||||
|
||||
|
||||
if(SHUTTLE_DOCKED)
|
||||
@@ -537,7 +543,7 @@
|
||||
|
||||
/obj/item/storage/pod/attack_hand(mob/user)
|
||||
if (can_interact(user))
|
||||
SendSignal(COMSIG_TRY_STORAGE_SHOW, user)
|
||||
SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SHOW, user)
|
||||
return TRUE
|
||||
|
||||
/obj/item/storage/pod/MouseDrop(over_object, src_location, over_location)
|
||||
|
||||
@@ -36,5 +36,5 @@
|
||||
if(last_request && (last_request + cooldown > world.time))
|
||||
return
|
||||
last_request = world.time
|
||||
to_chat(usr, "<span class='notice'>Your request has been recieved by CentCom.</span>")
|
||||
to_chat(usr, "<span class='notice'>Your request has been received by CentCom.</span>")
|
||||
to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;[HrefToken()];secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to CentCom.</font>")
|
||||
|
||||
@@ -25,7 +25,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
|
||||
pixel_x = oldPY
|
||||
pixel_y = (oldPX*(-1))
|
||||
|
||||
SendSignal(COMSIG_ATOM_ROTATE, rotation, params)
|
||||
SEND_SIGNAL(src, COMSIG_ATOM_ROTATE, rotation, params)
|
||||
|
||||
/************************************Turf rotate procs************************************/
|
||||
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
var/datum/job/captain/C = new /datum/job/captain
|
||||
access_card.access = C.get_access()
|
||||
access_card.access |= ACCESS_CENT_BAR
|
||||
access_card.flags_1 |= NODROP_1
|
||||
access_card.item_flags |= NODROP
|
||||
|
||||
/mob/living/simple_animal/hostile/alien/maid/barmaid/Destroy()
|
||||
qdel(access_card)
|
||||
|
||||
@@ -13,7 +13,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
|
||||
/obj/machinery/clonepod,
|
||||
/obj/effect/mob_spawn,
|
||||
/obj/effect/hierophant,
|
||||
/obj/structure/recieving_pad,
|
||||
/obj/structure/receiving_pad,
|
||||
/obj/effect/clockwork/spatial_gateway,
|
||||
/obj/structure/destructible/clockwork/powered/clockwork_obelisk,
|
||||
/obj/item/warp_cube,
|
||||
|
||||
Reference in New Issue
Block a user