| " + dat += "[team] PLAYER" + dat += " | " + dat += "||
"
+ if(!card)
+ dat += "No Nano-Mob card loaded." + dat += " | "
+ dat += "||
| Surrender! | " + dat += "
"
+ dat += "[mob_info.mob_name]" + dat += " | "
+ if(mob_info.nickname)
+ dat += "" + else + dat += " | "
+ var/img_src = "[mob_info.icon_state_normal].png"
+ if(mob_info.is_shiny)
+ dat += "[mob_info.icon_state_shiny].png"
+ dat += " | "
+ dat += "
"
+ dat += "[mob_info.nickname]" + dat += " | "
+ dat += "
" + dat += "Health: [mob_info.cur_health] / [mob_info.max_health]
" + dat += "
| Attack! | " + else + dat += "Incapacitated! | " + dat += "Recall! | " + dat += "
") diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 27a671590db..6fbd805f6b0 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -109,16 +109,18 @@ var/list/alldepartments = list() if(href_list["paper"]) if(copyitem) - copyitem.loc = usr.loc - usr.put_in_hands(copyitem) - to_chat(usr, "You take \the [copyitem] out of \the [src].") + copyitem.forceMove(get_turf(src)) + if(ishuman(usr)) + if(!usr.get_active_hand()) + usr.put_in_hands(copyitem) + to_chat(usr, "You eject \the [copyitem] from \the [src].") copyitem = null else var/obj/item/I = usr.get_active_hand() if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle)) usr.drop_item() copyitem = I - I.loc = src + I.forceMove(src) to_chat(usr, "You insert \the [I] into \the [src].") flick(insert_anim, src) @@ -163,24 +165,24 @@ var/list/alldepartments = list() /obj/machinery/photocopier/faxmachine/proc/scan(var/obj/item/weapon/card/id/card = null) if(scan) // Card is in machine if(ishuman(usr)) - scan.loc = usr.loc + scan.forceMove(get_turf(usr)) if(!usr.get_active_hand()) usr.put_in_hands(scan) scan = null else - scan.loc = src.loc + scan.forceMove(get_turf(src)) scan = null else if(!card) var/obj/item/I = usr.get_active_hand() if(istype(I, /obj/item/weapon/card/id)) usr.drop_item() - I.loc = src + I.forceMove(src) scan = I else if(istype(card)) usr.drop_item() - card.loc = src + card.forceMove(src) scan = card nanomanager.update_uis(src) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 104de41520e..d333ed1cf47 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -79,8 +79,10 @@ updateUsrDialog() else if(href_list["remove"]) if(copyitem) - copyitem.loc = usr.loc - usr.put_in_hands(copyitem) + copyitem.forceMove(get_turf(src)) + if(ishuman(usr)) + if(!usr.get_active_hand()) + usr.put_in_hands(copyitem) to_chat(usr, "You take \the [copyitem] out of \the [src].") copyitem = null updateUsrDialog() @@ -125,7 +127,7 @@ if(!copyitem) user.drop_item() copyitem = O - O.loc = src + O.forceMove(src) to_chat(user, "You insert \the [O] into \the [src].") flick(insert_anim, src) updateUsrDialog() @@ -150,10 +152,10 @@ if(ismob(G.affecting) && G.affecting != ass) var/mob/GM = G.affecting visible_message("[usr] drags [GM.name] onto the photocopier!") - GM.loc = get_turf(src) + GM.forceMove(get_turf(src)) ass = GM if(copyitem) - copyitem.loc = src.loc + copyitem.forceMove(get_turf(src)) copyitem = null updateUsrDialog() return @@ -290,10 +292,10 @@ W = copy(W) else if(istype(W, /obj/item/weapon/photo)) W = photocopy(W) - W.loc = p + W.forceMove(p) p.amount++ p.amount-- - p.loc = src.loc + p.forceMove(get_turf(src)) p.update_icon() p.icon_state = "paper_words" p.name = bundle.name @@ -313,10 +315,10 @@ if(target.anchored) return if(!ishuman(user)) return visible_message("[usr] drags [target.name] onto the photocopier!") - target.loc = get_turf(src) + target.forceMove(get_turf(src)) ass = target if(copyitem) - copyitem.loc = src.loc + copyitem.forceMove(get_turf(src)) visible_message("[copyitem] is shoved out of the way by [ass]!") copyitem = null updateUsrDialog() diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 364f7b50f02..4cae827dd8e 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -207,7 +207,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s ..() -/obj/item/device/camera/proc/get_icon(list/turfs, turf/center,mob/user) +/obj/item/device/camera/proc/get_icon(list/turfs, turf/center, mob/user) //Bigger icon base to capture those icons that were shifted to the next tile //i.e. pretty much all wall-mounted machinery @@ -218,11 +218,11 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s var/atoms[] = list() for(var/turf/the_turf in turfs) - // Add outselves to the list of stuff to draw + // Add ourselves to the list of stuff to draw atoms.Add(the_turf); // As well as anything that isn't invisible. for(var/atom/A in the_turf) - if(A.invisibility ) + if(A.invisibility) if(see_ghosts && istype(A,/mob/dead/observer)) var/mob/dead/observer/O = A if(O.following) @@ -234,7 +234,16 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s else//its not a ghost continue else//not invisable, not a spookyghost add it. - atoms.Add(A) + var/disguised = null + if(user.viewing_alternate_appearances && user.viewing_alternate_appearances.len && ishuman(A) && A.alternate_appearances && A.alternate_appearances.len) //This whole thing and the stuff below just checks if the atom is a Solid Snake cosplayer. + for(var/datum/alternate_appearance/alt_appearance in user.viewing_alternate_appearances) + if(alt_appearance.owner == A) //If it turns out they are, don't blow their cover. That'd be rude. + atoms.Add(image(alt_appearance.img, A.loc, layer = 4, dir = A.dir)) //Render their disguise. + atoms.Remove(A) //Don't blow their cover. + disguised = 1 + continue + if(!disguised) //If they aren't, treat them normally. + atoms.Add(A) // Sort the atoms into their layers @@ -320,14 +329,10 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s on = 1 /obj/item/device/camera/proc/can_capture_turf(turf/T, mob/user) - var/mob/dummy = new(T) //Go go visibility check dummy var/viewer = user if(user.client) //To make shooting through security cameras possible viewer = user.client.eye - var/can_see = (dummy in viewers(world.view, viewer)) != null - - dummy.loc = null - dummy = null //Alas, nameless creature //garbage collect it instead + var/can_see = (T in view(viewer)) //No x-ray vision cameras. return can_see /obj/item/device/camera/proc/captureimage(atom/target, mob/user, flag) @@ -350,7 +355,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s printpicture(user, P) /obj/item/device/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, flag) - var/icon/photoimage = get_icon(turfs, target,user) + var/icon/photoimage = get_icon(turfs, target, user) var/icon/small_img = icon(photoimage) var/icon/tiny_img = icon(photoimage) @@ -532,13 +537,13 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s if(get_dist(src, M) <= canhear_range) talk_into(M, msg) for(var/obj/machinery/computer/security/telescreen/T in machines) - if(T.current == camera) + if(T.watchers[M] == camera) T.audible_message("(Newscaster) [M] says, '[msg]'", hearing_distance = 2) /obj/item/device/videocam/hear_message(mob/M as mob, msg) if(camera && on) for(var/obj/machinery/computer/security/telescreen/T in machines) - if(T.current == camera) + if(T.watchers[M] == camera) T.audible_message("(Newscaster) [M] [msg]", hearing_distance = 2) diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index ed7c380c426..5cbaf08fd34 100755 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -427,6 +427,9 @@ var/global/list/obj/item/device/pda/PDAs = list() user.drop_item() C.forceMove(src) to_chat(user, "You slide \the [C] into \the [src].") + else if(istype(C, /obj/item/weapon/nanomob_card)) + if(cartridge && istype(cartridge, /obj/item/weapon/cartridge/mob_hunt_game)) + cartridge.attackby(C, user, params) /obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob) if(istype(C, /mob/living/carbon) && scanmode) @@ -498,3 +501,12 @@ var/global/list/obj/item/device/pda/PDAs = list() else close(usr) return 0 + +/obj/item/device/pda/process() + if(current_app) + current_app.program_process() + +/obj/item/device/pda/hit_check(speed) + if(current_app) + current_app.program_hit_check() + ..() \ No newline at end of file diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm index e7c433c65a6..4ad6c40ae24 100644 --- a/code/modules/pda/app.dm +++ b/code/modules/pda/app.dm @@ -1,6 +1,6 @@ // Base class for anything that can show up on home screen /datum/data/pda - var/icon = "tasks" + var/icon = "tasks" //options comes from http://fontawesome.io/icons/ var/notify_icon = "exclamation-circle" var/notify_silent = 0 var/hidden = 0 // program not displayed in main menu @@ -12,6 +12,16 @@ return ..() /datum/data/pda/proc/start() + return + +/datum/data/pda/proc/stop() + return + +/datum/data/pda/proc/program_process() + return + +/datum/data/pda/proc/program_hit_check() + return /datum/data/pda/proc/notify(message, blink = 1) if(message) @@ -56,6 +66,8 @@ title = name /datum/data/pda/app/start() + if(pda.current_app) + pda.current_app.stop() pda.current_app = src return 1 diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm index c96a8cfb11c..30d26607113 100644 --- a/code/modules/pda/cart.dm +++ b/code/modules/pda/cart.dm @@ -22,7 +22,7 @@ if(radio) radio.initialize() ..() - + /obj/item/weapon/cartridge/Destroy() if(radio) qdel(radio) @@ -53,8 +53,7 @@ /obj/item/weapon/cartridge/atmos name = "BreatheDeep Cartridge" icon_state = "cart-a" - programs = list( - new/datum/data/pda/utility/scanmode/gas) + programs = list(new/datum/data/pda/utility/scanmode/gas) /obj/item/weapon/cartridge/medical name = "Med-U Cartridge" @@ -66,8 +65,7 @@ /obj/item/weapon/cartridge/chemistry name = "ChemWhiz Cartridge" icon_state = "cart-chem" - programs = list( - new/datum/data/pda/utility/scanmode/reagent) + programs = list(new/datum/data/pda/utility/scanmode/reagent) /obj/item/weapon/cartridge/security name = "R.O.B.U.S.T. Cartridge" @@ -94,30 +92,25 @@ name = "CustodiPRO Cartridge" desc = "The ultimate in clean-room design." icon_state = "cart-j" - programs = list( - new/datum/data/pda/app/janitor) + programs = list(new/datum/data/pda/app/janitor) /obj/item/weapon/cartridge/lawyer name = "P.R.O.V.E. Cartridge" icon_state = "cart-s" - programs = list( - new/datum/data/pda/app/crew_records/security) + programs = list(new/datum/data/pda/app/crew_records/security) /obj/item/weapon/cartridge/clown name = "Honkworks 5.0" icon_state = "cart-clown" charges = 5 - programs = list( - new/datum/data/pda/utility/honk) - messenger_plugins = list( - new/datum/data/pda/messenger_plugin/virus/clown) + programs = list(new/datum/data/pda/utility/honk) + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/clown) /obj/item/weapon/cartridge/mime name = "Gestur-O 1000" icon_state = "cart-mi" charges = 5 - messenger_plugins = list( - new/datum/data/pda/messenger_plugin/virus/mime) + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/mime) /* /obj/item/weapon/cartridge/botanist @@ -129,8 +122,7 @@ /obj/item/weapon/cartridge/signal name = "generic signaler cartridge" desc = "A data cartridge with an integrated radio signaler module." - programs = list( - new/datum/data/pda/app/signaller) + programs = list(new/datum/data/pda/app/signaller) /obj/item/weapon/cartridge/signal/initialize() radio = new /obj/item/radio/integrated/signal(src) @@ -162,8 +154,7 @@ /obj/item/weapon/cartridge/head name = "Easy-Record DELUXE" icon_state = "cart-h" - programs = list( - new/datum/data/pda/app/status_display) + programs = list(new/datum/data/pda/app/status_display) /obj/item/weapon/cartridge/hop name = "HumanResources9001" @@ -303,12 +294,38 @@ icon_state = "cart" var/initial_remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. charges = 4 - programs = list( - new/datum/data/pda/utility/toggle_door) - messenger_plugins = list( - new/datum/data/pda/messenger_plugin/virus/detonate) + programs = list(new/datum/data/pda/utility/toggle_door) + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/detonate) /obj/item/weapon/cartridge/syndicate/New() var/datum/data/pda/utility/toggle_door/D = programs[1] if(istype(D)) - D.remote_door_id = initial_remote_door_id \ No newline at end of file + D.remote_door_id = initial_remote_door_id + +/obj/item/weapon/cartridge/mob_hunt_game + name = "Nano-Mob Hunter GO! Cartridge" + desc = "The hit new PDA game that lets you track down and capture your favorite Nano-Mobs living in your world!" + icon_state = "cart-eye" + programs = list(new/datum/data/pda/app/mob_hunter_game) + var/emagged = 0 + +/obj/item/weapon/cartridge/mob_hunt_game/attackby(obj/item/O, mob/user, params) + if(istype(O, /obj/item/weapon/nanomob_card)) + var/obj/item/weapon/nanomob_card/card = O + var/datum/data/pda/app/mob_hunter_game/my_game = programs[1] + if(my_game.register_capture(card.mob_data)) + to_chat(user, "Transfer successful!") + qdel(card) + else + to_chat(user, "Transfer failed. Could not read mob data from card.") + else + ..() + +/obj/item/weapon/cartridge/mob_hunt_game/emag_act(mob/user) + if(!emagged) + emagged = 1 + var/datum/data/pda/app/mob_hunter_game/my_game = programs[1] + my_game.hacked = 1 + to_chat(user, "TR4P_M45T3R.mod successfully initialized. ToS violated. User Agreement nullified. Gotta pwn them all.") + to_chat(user, "You can now create trapped versions of any mob in your collection that will damage hunters who attempt to capture it.") + description_antag = "This copy of Nano-Mob Hunter GO! has been hacked to allow the creation of trap mobs which will cause any PDA that attempts to capture it to shock anyone holding it. Hacked copies of the game will not trigger the trap." \ No newline at end of file diff --git a/code/modules/pda/mob_hunt_game_app.dm b/code/modules/pda/mob_hunt_game_app.dm new file mode 100644 index 00000000000..9b8e3225976 --- /dev/null +++ b/code/modules/pda/mob_hunt_game_app.dm @@ -0,0 +1,182 @@ + +/* + This stuff isn't included with in core_apps.dm because it is so distinct and would end up making the file huge (more than it already is). + I put it in it's own file in order to help it stay organized and easier to locate the procs and such. + For reference, the other Nano-mob Hunter GO files are in /code/game/modules/arcade/mob_hunt +*/ + +/datum/data/pda/app/mob_hunter_game + name = "Nano-Mob Hunter GO" + icon = "gamepad" + template = "pda_mob_hunt" + category = "Games" + + var/list/my_collection = list() + var/current_index = 0 + var/connected = 0 + var/hacked = 0 //if set, this cartridge is able to spawn trap mobs from its collection (set via emag_act on the cartridge) + var/catch_mod = 0 //used to adjust the likelihood of a mob running from this client, a negative value means it is less likely to run (support for temporary bonuses) + var/wild_captures = 0 //used to track the total number of mobs captured from the wild (does not count card mobs) by this client + var/scan_range = 3 //maximum distance (in tiles) from which the client can reveal nearby mobs + +/datum/data/pda/app/mob_hunter_game/start() + ..() + processing_objects.Add(pda) + +/datum/data/pda/app/mob_hunter_game/stop() + ..() + disconnect("Program Terminated") + processing_objects.Remove(pda) + +/datum/data/pda/app/mob_hunter_game/proc/scan_nearby() + if(!mob_hunt_server || !connected) + return + for(var/turf/T in range(scan_range, get_turf(pda))) + for(var/obj/effect/nanomob/N in T.contents) + if(src in N.clients_encountered) + //hide the mob + N.conceal() + else + //reveal the mob + N.reveal() + +/datum/data/pda/app/mob_hunter_game/proc/reconnect() + if(!mob_hunt_server || !mob_hunt_server.server_status || connected) + //show a message about the server being unavailable (because it doesn't exist / didn't get set to the global var / is offline) + return 0 + mob_hunt_server.connected_clients += src + connected = 1 + if(pda) + pda.audible_message("[bicon(pda)] Connection established. Capture all of the mobs, [pda.owner ? pda.owner : "hunter"]!", null, 2) + return 1 + +/datum/data/pda/app/mob_hunter_game/proc/get_player() + if(!pda) + return null + if(ishuman(pda.loc)) + var/mob/living/carbon/human/H = pda.loc + return H + return null + +/datum/data/pda/app/mob_hunter_game/proc/disconnect(reason = null) + if(!mob_hunt_server || !connected) + return + mob_hunt_server.connected_clients -= src + for(var/obj/effect/nanomob/N in (mob_hunt_server.normal_spawns + mob_hunt_server.trap_spawns)) + N.conceal(list(get_player())) + connected = 0 + //show a disconnect message if we were disconnected involuntarily (reason argument provided) + if(pda && reason) + pda.audible_message("[bicon(pda)] Disconnected from server. Reason: [reason].", null, 2) + +/datum/data/pda/app/mob_hunter_game/program_process() + if(!mob_hunt_server || !connected) + return + scan_nearby() + +/datum/data/pda/app/mob_hunter_game/program_hit_check() + if(!pda) + return + for(var/obj/effect/nanomob/hit_mob in get_turf(pda)) + hit_mob.hitby(pda) + +/datum/data/pda/app/mob_hunter_game/proc/register_capture(datum/mob_hunt/captured, wild = 0) + if(!captured) + return 0 + my_collection.Add(captured) + if(wild) + wild_captures++ + return 1 + +/datum/data/pda/app/mob_hunter_game/update_ui(mob/user, list/data) + if(!mob_hunt_server || !(src in mob_hunt_server.connected_clients)) + data["connected"] = 0 + else + data["connected"] = 1 + data["wild_captures"] = wild_captures + data["no_collection"] = 0 + if(!my_collection.len) + data["no_collection"] = 1 + return + var/datum/mob_hunt/mob_info + if(!current_index) + current_index = 1 + if(current_index > my_collection.len) + current_index = 1 + if(current_index < 1) + current_index = my_collection.len + mob_info = my_collection[current_index] + var/list/entry = list( + "nickname" = mob_info.nickname, + "real_name" = mob_info.mob_name, + "level" = mob_info.level, + "type1" = mob_info.get_type1(), + "type2" = mob_info.get_type2(), + "sprite" = "[mob_info.icon_state_normal].png", + "is_hacked" = hacked + ) + if(mob_info.is_shiny) + entry["sprite"] = "[mob_info.icon_state_shiny].png" + data["entry"] = entry + +/datum/data/pda/app/mob_hunter_game/proc/assign_nickname() + if(!my_collection.len) + return + var/datum/mob_hunt/mob_info = my_collection[current_index] + var/old_name = mob_info.mob_name + if(mob_info.nickname) + old_name = mob_info.nickname + mob_info.nickname = input("Give a nickname to [old_name]?", "Nickname", old_name) + +/datum/data/pda/app/mob_hunter_game/proc/release() + if(!my_collection.len) + return + if(alert("Are you sure you want to release this mob back into the wild?", "Confirm Release", "Yes", "No") == "Yes") + remove_mob() + +/datum/data/pda/app/mob_hunter_game/proc/print_card() + if(!pda || !my_collection.len) + return + var/obj/item/weapon/nanomob_card/card = new/obj/item/weapon/nanomob_card(null) + var/datum/mob_hunt/mob_info = my_collection[current_index] + card.mob_data = mob_info + card.update_info() + card.forceMove(get_turf(pda)) + remove_mob() + +/datum/data/pda/app/mob_hunter_game/proc/remove_mob() + if(!my_collection.len) + return + my_collection.Remove(my_collection[current_index]) + if(current_index > my_collection.len) + current_index = my_collection.len + +/datum/data/pda/app/mob_hunter_game/proc/set_trap() + if(!my_collection.len || !pda || !hacked) + return + var/datum/mob_hunt/bait = my_collection[current_index] + bait = bait.type + new bait(1, get_turf(pda)) + +/datum/data/pda/app/mob_hunter_game/Topic(href, list/href_list) + switch(href_list["choice"]) + if("Rename") + assign_nickname() + if("Release") + release() + if("Next") + current_index++ + if(current_index > my_collection.len) + current_index = 1 + if("Prev") + current_index-- + if(current_index < 1) + current_index = my_collection.len + if("Reconnect") + reconnect() + if("Disconnect") + disconnect() + if("Transfer") + print_card() + if("Set_Trap") + set_trap() \ No newline at end of file diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index c91127d7f54..675cbcdfac6 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -896,7 +896,7 @@ return 1 /obj/machinery/power/apc/proc/is_authenticated(mob/user as mob) - if(isobserver(user) && check_rights(R_ADMIN, 0, user)) + if(user.can_admin_interact()) return 1 if(isAI(user) || isrobot(user)) return 1 @@ -904,7 +904,7 @@ return !locked /obj/machinery/power/apc/proc/is_locked(mob/user as mob) - if(isobserver(user) && check_rights(R_ADMIN, 0, user)) + if(user.can_admin_interact()) return 0 if(isAI(user) || isrobot(user)) return 0 diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index bcc4335f66a..27e996bb457 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -352,7 +352,7 @@ obj/item/projectile/kinetic/New() name = "snowball" icon_state = "snowball" hitsound = 'sound/items/dodgeball.ogg' - damage = 3 + damage = 4 damage_type = BURN /obj/item/projectile/snowball/on_hit(atom/target) //chilling @@ -366,7 +366,7 @@ obj/item/projectile/kinetic/New() name = "ornament" icon_state = "ornament-1" hitsound = 'sound/effects/Glasshit.ogg' - damage = 5 + damage = 7 damage_type = BRUTE /obj/item/projectile/ornament/New() diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 55c85335c41..f1ad87ddc7c 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -91,6 +91,9 @@ var/datum/announcement/priority/emergency_shuttle_called = new(0, new_sound = sound('sound/AI/shuttlecalled.ogg')) var/datum/announcement/priority/emergency_shuttle_recalled = new(0, new_sound = sound('sound/AI/shuttlerecalled.ogg')) + var/canRecall = TRUE //no bad condom, do not recall the crew transfer shuttle! + + /obj/docking_port/mobile/emergency/register() if(!..()) return 0 //shuttle master not initialized @@ -98,6 +101,16 @@ shuttle_master.emergency = src return 1 +/obj/docking_port/mobile/emergency/Destroy(force) + if(force) + // This'll make the shuttle subsystem use the backup shuttle. + if(shuttle_master.emergency == src) + // If we're the selected emergency shuttle + shuttle_master.emergencyDeregister() + + + return ..() + /obj/docking_port/mobile/emergency/timeLeft(divisor) if(divisor <= 0) divisor = 10 @@ -138,6 +151,9 @@ emergency_shuttle_called.Announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][shuttle_master.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ]") /obj/docking_port/mobile/emergency/cancel(area/signalOrigin) + if(!canRecall) + return + if(mode != SHUTTLE_CALL) return @@ -286,3 +302,19 @@ var/list/turfs = get_area_turfs(target_area) var/turf/T = pick(turfs) src.loc = T + +/obj/docking_port/mobile/emergency/backup + name = "backup shuttle" + id = "backup" + dwidth = 2 + width = 8 + height = 8 + dir = 4 + + roundstart_move = "backup_away" + +/obj/docking_port/mobile/emergency/backup/register() + var/current_emergency = shuttle_master.emergency + ..() + shuttle_master.emergency = current_emergency + shuttle_master.backup_shuttle = src diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm new file mode 100644 index 00000000000..815541f36bc --- /dev/null +++ b/code/modules/shuttle/on_move.dm @@ -0,0 +1,72 @@ +// Shuttle on-movement // +/atom/movable/proc/onShuttleMove(turf/T1, rotation) + if(rotation) + shuttleRotate(rotation) + forceMove(T1) + return 1 + +/atom/movable/lighting_overlay/onShuttleMove() + return 0 + +/obj/onShuttleMove() + if(invisibility >= 101) + return 0 + . = ..() + +/obj/machinery/door/onShuttleMove() + . = ..() + if(!.) + return + addtimer(src, "close", 0, TRUE, 0, 1) + // Close any nearby airlocks as well + for(var/obj/machinery/door/D in orange(1, src)) + addtimer(D, "close", 0, TRUE, 0, 1) + +/obj/machinery/door/airlock/onShuttleMove() + . = ..() + if(id_tag == "s_docking_airlock") + addtimer(src, "lock", 0, TRUE) + +/mob/onShuttleMove() + if(!move_on_shuttle) + return 0 + . = ..() + if(!.) + return + if(client) + if(buckled) + shake_camera(src, 2, 1) // turn it down a bit come on + else + shake_camera(src, 7, 1) + +/mob/living/carbon/onShuttleMove() + . = ..() + if(!.) + return + if(!buckled) + Weaken(3) + +// After docking // +/atom/proc/postDock(obj/docking_port/S1) + if(smooth) + smooth_icon(src) + +/obj/machinery/door/airlock/postDock(obj/docking_port/stationary/S1) + . = ..() + if(!S1.lock_shuttle_doors && id_tag == "s_docking_airlock") + addtimer(src, "unlock", 0, TRUE) + +// Shuttle Rotation // +/atom/proc/shuttleRotate(rotation) + //rotate our direction + dir = angle2dir(rotation+dir2angle(dir)) + + //rotate the pixel offsets too. + if(pixel_x || pixel_y) + if(rotation < 0) + rotation += 360 + for(var/turntimes=rotation/90;turntimes>0;turntimes--) + var/oldPX = pixel_x + var/oldPY = pixel_y + pixel_x = oldPY + pixel_y = (oldPX*(-1)) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index ea691ed7a44..a6bb18bec14 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -18,9 +18,18 @@ var/dwidth = 0 //position relative to covered area, perpendicular to dir var/dheight = 0 //position relative to covered area, parallel to dir + // A timid shuttle will not register itself with the shuttle subsystem + // All shuttle templates are timid + var/timid = FALSE + //these objects are indestructable -/obj/docking_port/Destroy() - return QDEL_HINT_LETMELIVE +/obj/docking_port/Destroy(force) + if(force) + ..() + . = QDEL_HINT_HARDDEL_NOW + else + + return QDEL_HINT_LETMELIVE /obj/docking_port/singularity_pull() return @@ -212,6 +221,14 @@ highlight("#0f0") #endif + + + +/obj/docking_port/mobile/initialize() + if(!timid) + register() + ..() + /obj/docking_port/mobile/register() if(!shuttle_master) throw EXCEPTION("docking port [src] could not initialize.") @@ -226,6 +243,13 @@ return 1 +/obj/docking_port/mobile/Destroy(force) + if(force) + shuttle_master.mobile -= src + areaInstance = null + destination = null + previous = null + return ..() //this is a hook for custom behaviour. Maybe at some point we could add checks to see if engines are intact /obj/docking_port/mobile/proc/canMove() @@ -234,29 +258,50 @@ //this is to check if this shuttle can physically dock at dock S /obj/docking_port/mobile/proc/canDock(obj/docking_port/stationary/S) if(!istype(S)) - return 1 + return SHUTTLE_NOT_A_DOCKING_PORT if(istype(S, /obj/docking_port/stationary/transit)) - return 0 + return SHUTTLE_CAN_DOCK //check dock is big enough to contain us if(dwidth > S.dwidth) - return 2 + return SHUTTLE_DWIDTH_TOO_LARGE if(width-dwidth > S.width-S.dwidth) - return 3 + return SHUTTLE_WIDTH_TOO_LARGE if(dheight > S.dheight) - return 4 + return SHUTTLE_DHEIGHT_TOO_LARGE if(height-dheight > S.height-S.dheight) - return 5 + return SHUTTLE_HEIGHT_TOO_LARGE //check the dock isn't occupied - if(S.get_docked()) - return 6 - return 0 //0 means we can dock + var/currently_docked = S.get_docked() + if(currently_docked) + // by someone other than us + if(currently_docked != src) + return SHUTTLE_SOMEONE_ELSE_DOCKED + else + // This isn't an error, per se, but we can't let the shuttle code + // attempt to move us where we currently are, it will get weird. + return SHUTTLE_ALREADY_DOCKED + return SHUTTLE_CAN_DOCK + +/obj/docking_port/mobile/proc/check_dock(obj/docking_port/stationary/S) + var/status = canDock(S) + if(status == SHUTTLE_CAN_DOCK) + return TRUE + else if(status == SHUTTLE_ALREADY_DOCKED) + // We're already docked there, don't need to do anything. + // Triggering shuttle movement code in place is weird + return FALSE + else + var/msg = "check_dock(): shuttle [src] cannot dock at [S], error: [status]" + message_admins(msg) + throw EXCEPTION(msg) + return FALSE + //call the shuttle to destination S /obj/docking_port/mobile/proc/request(obj/docking_port/stationary/S) - if(canDock(S)) - . = 1 - throw EXCEPTION("request(): shuttle cannot dock") - return 1 //we can't dock at S + + if(!check_dock(S)) + return switch(mode) if(SHUTTLE_CALL) @@ -301,36 +346,48 @@ else WARNING("shuttle \"[id]\" could not enter transit space. S0=[S0 ? S0.id : "null"] S1=[S1 ? S1.id : "null"]") -//default shuttleRotate -/atom/proc/shuttleRotate(rotation) - //rotate our direction - dir = angle2dir(rotation+dir2angle(dir)) - //rotate the pixel offsets too. - if(pixel_x || pixel_y) - if(rotation < 0) - rotation += 360 - for(var/turntimes=rotation/90;turntimes>0;turntimes--) - var/oldPX = pixel_x - var/oldPY = pixel_y - pixel_x = oldPY - pixel_y = (oldPX*(-1)) -/atom/proc/postDock() - if(smooth) - smooth_icon(src) +/obj/docking_port/mobile/proc/jumpToNullSpace() + // Destroys the docking port and the shuttle contents. + // Not in a fancy way, it just ceases. + var/obj/docking_port/stationary/S0 = get_docked() + var/turf_type = /turf/space + var/area_type = /area/space + if(S0) + if(S0.turf_type) + turf_type = S0.turf_type + if(S0.area_type) + area_type = S0.area_type + var/list/L0 = return_ordered_turfs(x, y, z, dir, areaInstance) + + //remove area surrounding docking port + if(areaInstance.contents.len) + var/area/A0 = locate("[area_type]") + if(!A0) + A0 = new area_type(null) + for(var/turf/T0 in L0) + A0.contents += T0 + + for(var/i in L0) + var/turf/T0 = i + if(!T0) + continue + T0.empty(turf_type) + + qdel(src, force=TRUE) //this is the main proc. It instantly moves our mobile port to stationary port S1 //it handles all the generic behaviour, such as sanity checks, closing doors on the shuttle, stunning mobs, etc -/obj/docking_port/mobile/proc/dock(obj/docking_port/stationary/S1) - . = canDock(S1) - if(.) - throw EXCEPTION("dock(): shuttle cannot dock") - return . +/obj/docking_port/mobile/proc/dock(obj/docking_port/stationary/S1, force=FALSE) + // Crashing this ship with NO SURVIVORS + if(!force) + if(!check_dock(S1)) + return -1 - if(canMove()) - return -1 + if(canMove()) + return -1 // //rotate transit docking ports, so we don't need zillions of variants // if(istype(S1, /obj/docking_port/stationary/transit)) @@ -367,9 +424,7 @@ A0.contents += T0 //move or squish anything in the way ship at destination - roadkill(L1, S1.dir) - - var/list/door_unlock_list = list() + roadkill(L0, L1, S1.dir) for(var/i in 1 to L0.len) var/turf/T0 = L0[i] @@ -388,49 +443,8 @@ Ts1.copy_air_with_tile(T0) //move mobile to new location - - - for(var/atom/movable/AM in T0) - if(rotation) - AM.shuttleRotate(rotation) - - if(istype(AM,/obj)) - var/obj/O = AM - if(istype(O, /obj/docking_port/stationary)) - continue - O.forceMove(T1) - - //close open doors - if(istype(O, /obj/machinery/door)) - var/obj/machinery/door/Door = O - spawn(-1) - if(Door) - if(istype(Door, /obj/machinery/door/airlock)) - var/obj/machinery/door/airlock/A = Door - A.close(0,1) - if(A.id_tag == "s_docking_airlock") - A.lock() - door_unlock_list += A - else - Door.close() - else if(istype(AM,/mob)) - var/mob/M = AM - if(!M.move_on_shuttle) - continue - M.forceMove(T1) - - //docking turbulence - if(M.client) - spawn(0) - if(M.buckled) - shake_camera(M, 2, 1) // turn it down a bit come on - else - shake_camera(M, 7, 1) - if(istype(M, /mob/living/carbon)) - if(!M.buckled) - M.Weaken(3) - + AM.onShuttleMove(T1, rotation) if(rotation) T1.shuttleRotate(rotation) @@ -448,40 +462,39 @@ for(var/A1 in L1) var/turf/T1 = A1 - T1.postDock() + T1.postDock(S1) for(var/atom/movable/M in T1) - M.postDock() + M.postDock(S1) loc = S1.loc dir = S1.dir unlockPortDoors(S1) - if(S1 && !S1.lock_shuttle_doors) - for(var/obj/machinery/door/airlock/A in door_unlock_list) - spawn(-1) - A.unlock() - -/* - if(istype(S1, /obj/docking_port/stationary/transit)) - var/d = turn(dir, 180 + travelDir) - for(var/turf/space/transit/T in S1.return_ordered_turfs()) - T.pushdirection = d - T.update_icon() -*/ - /obj/docking_port/mobile/proc/findTransitDock() var/obj/docking_port/stationary/transit/T = shuttle_master.getDock("[id]_transit") - if(T && !canDock(T)) + if(T && check_dock(T)) return T -/* commented out due to issues with rotation - for(var/obj/docking_port/stationary/transit/S in shuttle_master.transit) - if(S.id) - continue - if(!canDock(S)) - return S -*/ + + +/obj/docking_port/mobile/proc/findRoundstartDock() + var/obj/docking_port/stationary/D + D = shuttle_master.getDock(roundstart_move) + + if(D) + return D + +/obj/docking_port/mobile/proc/dockRoundstart() + // Instead of spending a lot of time trying to work out where to place + // our shuttle, just create it somewhere empty and send it to where + // it should go + var/obj/docking_port/stationary/D = findRoundstartDock() + return dock(D) + +/obj/effect/landmark/shuttle_import + name = "Shuttle Import" + //shuttle-door closing is handled in the dock() proc whilst looping through turfs @@ -506,41 +519,43 @@ if(A.locked) A.unlock() -/obj/docking_port/mobile/proc/roadkill(list/L, dir, x, y) - for(var/turf/T in L) - for(var/atom/movable/AM in T) - if(ismob(AM)) - if(istype(AM, /mob/living)) - var/mob/living/M = AM - M.Paralyse(10) - M.take_organ_damage(80) - M.anchored = 0 - else - continue +/obj/docking_port/mobile/proc/roadkill(list/L0, list/L1, dir) + var/list/hurt_mobs = list() + for(var/i in 1 to L0.len) + var/turf/T0 = L0[i] + var/turf/T1 = L1[i] + if(!T0 || !T1) + continue + for(var/atom/movable/AM in T1) + if(AM.pulledby) + AM.pulledby.stop_pulling() + if(ismob(AM)) + var/mob/M = AM + if(M.buckled) + M.buckled.unbuckle_mob(M, 1) + if(isliving(AM)) + var/mob/living/L = AM + L.stop_pulling() + if(L.anchored) + L.gib() + else + if(!(L in hurt_mobs)) + hurt_mobs |= L + L.visible_message("[L] is hit by \ + a hyperspace ripple[L.anchored ? "":" and is thrown clear"]!", + "You feel an immense \ + crushing pressure as the space around you ripples.") + L.Paralyse(10) + L.ex_act(2) + + // Move unanchored atoms if(!AM.anchored) step(AM, dir) else - if(AM.simulated) //lighting overlays are static + if(AM.simulated) // Don't qdel lighting overlays, they are static qdel(AM) -/* -//used to check if atom/A is within the shuttle's bounding box -/obj/docking_port/mobile/proc/onShuttleCheck(atom/A) - var/turf/T = get_turf(A) - if(!T) - return 0 - var/list/L = return_coords() - if(L[1] > L[3]) - L.Swap(1,3) - if(L[2] > L[4]) - L.Swap(2,4) - - if(L[1] <= T.x && T.x <= L[3]) - if(L[2] <= T.y && T.y <= L[4]) - return 1 - return 0 -*/ //used by shuttle subsystem to check timers /obj/docking_port/mobile/proc/check() var/timeLeft = timeLeft(1) @@ -667,7 +682,7 @@ for(var/obj/docking_port/stationary/S in shuttle_master.stationary) if(!options.Find(S.id)) continue - if(M.canDock(S)) + if(!M.check_dock(S)) continue destination_found = 1 dat += "Send to [S.name]
" diff --git a/code/modules/shuttle/shuttle_manipulator.dm b/code/modules/shuttle/shuttle_manipulator.dm new file mode 100644 index 00000000000..34196c888b0 --- /dev/null +++ b/code/modules/shuttle/shuttle_manipulator.dm @@ -0,0 +1,321 @@ + +/obj/machinery/shuttle_manipulator + name = "shuttle manipulator" + desc = "I shall be telling this with a sigh\n\ + Somewhere ages and ages hence:\n\ + Two roads diverged in a wood, and I,\n\ + I took the one less traveled by,\n\ + And that has made all the difference." + + icon = 'icons/obj/machines/shuttle_manipulator.dmi' + icon_state = "holograph_on" + + var/selected_menu_key = "stat" + var/busy + // UI state variables + var/datum/map_template/shuttle/selected + + var/obj/docking_port/mobile/existing_shuttle + + var/obj/docking_port/mobile/preview_shuttle + var/datum/map_template/shuttle/preview_template + var/list/templates = list() + var/list/shuttle_data = list() + +/obj/machinery/shuttle_manipulator/New() + . = ..() + update_icon() + +/obj/machinery/shuttle_manipulator/update_icon() + overlays.Cut() + var/image/hologram_projection = image(icon, "hologram_on") + hologram_projection.pixel_y = 22 + var/image/hologram_ship = image(icon, "hologram_whiteship") + hologram_ship.pixel_y = 27 + overlays += hologram_projection + overlays += hologram_ship + +/obj/machinery/shuttle_manipulator/attack_ghost(user as mob) + attack_hand(user) + +/proc/shuttlemode2str(mode) + switch(mode) + if(SHUTTLE_IDLE) + . = "idle" + if(SHUTTLE_RECALL) + . = "recalled" + if(SHUTTLE_CALL) + . = "called" + if(SHUTTLE_DOCKED) + . = "docked" + if(SHUTTLE_STRANDED) + . = "stranded" + if(SHUTTLE_ESCAPE) + . = "escape" + if(!.) + throw EXCEPTION("shuttlemode2str(): invalid mode") + +/obj/machinery/shuttle_manipulator/attack_hand(mob/user) + ui_interact(user) + +/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + // update the ui if it exists, returns null if no ui is passed/found + ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + // the ui does not exist, so we'll create a new() one + // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm + ui = new(user, src, ui_key, "shuttle_manipulator.tmpl", "Shuttle Manipulator", 660, 700, null, null, admin_state) + // when the ui is first opened this is the data it will use + // open the new ui window + ui.open() + // auto update every Master Controller tick + ui.set_auto_update(1) + +/obj/machinery/shuttle_manipulator/ui_data(mob/user, datum/topic_state/state) + var/data[0] + data["selectedMenuKey"] = selected_menu_key + + data["templates"] = list() + var/list/templates = data["templates"] + data["templates_tabs"] = list() + data["selected"] = null + + for(var/shuttle_id in shuttle_templates) + var/datum/map_template/shuttle/S = shuttle_templates[shuttle_id] + + if(!templates[S.port_id]) + data["templates_tabs"] += S.port_id + // The first found shuttle type will be our default + if(!existing_shuttle) + existing_shuttle = shuttle_master.getShuttle(S.port_id) + templates[S.port_id] = list( + "port_id" = S.port_id, + "templates" = list() + ) + + var/list/L = list() + L["name"] = S.name + L["shuttle_id"] = S.shuttle_id + L["port_id"] = S.port_id + L["description"] = S.description + L["admin_notes"] = S.admin_notes + + if(selected == S) + data["selected"] = L + + templates[S.port_id]["templates"] += list(L) + + data["templates_tabs"] = sortList(data["templates_tabs"]) + + data["existing_shuttle"] = null + + // Status panel + data["shuttles"] = list() + for(var/i in shuttle_master.mobile) + var/obj/docking_port/mobile/M = i + var/list/L = list() + L["name"] = M.name + L["id"] = M.id + L["timer"] = M.timer + L["timeleft"] = M.getTimerStr() + var/can_fast_travel = FALSE + if(M.timer && M.timeLeft() >= 50) + can_fast_travel = TRUE + L["can_fast_travel"] = can_fast_travel + L["mode"] = capitalize(shuttlemode2str(M.mode)) + L["status"] = M.getStatusText() + if(M == existing_shuttle) + data["existing_shuttle"] = L + + data["shuttles"] += list(L) + return data + +/obj/machinery/shuttle_manipulator/Topic(href, href_list) + if(..()) + return + + var/mob/user = usr + + // Preload some common parameters + var/shuttle_id = href_list["shuttle_id"] + var/datum/map_template/shuttle/S = shuttle_templates[shuttle_id] + + + if(href_list["selectMenuKey"]) + selected_menu_key = href_list["selectMenuKey"] + return 1 // return 1 forces an update to all Nano uis attached to src + + if(href_list["select_template_category"]) + var/chosen_shuttle_id = href_list["select_template_category"] + selected = null + existing_shuttle = shuttle_master.getShuttle(chosen_shuttle_id) + return 1 + + if(href_list["select_template"]) + if(S) + existing_shuttle = shuttle_master.getShuttle(S.port_id) + selected = S + . = TRUE + + if(href_list["jump_to"]) + + if(href_list["type"] == "mobile") + for(var/i in shuttle_master.mobile) + var/obj/docking_port/mobile/M = i + if(M.id == href_list["id"]) + user.forceMove(get_turf(M)) + . = TRUE + break + + + if(href_list["fast_travel"]) + + for(var/i in shuttle_master.mobile) + var/obj/docking_port/mobile/M = i + if(M.id == href_list["id"] && M.timer && M.timeLeft() >= 50) + M.setTimer(50) + . = TRUE + message_admins("[key_name_admin(usr)] fast travelled \ + [M]") + log_admin("[key_name(usr)] fast travelled [M]") + feedback_add_details("shuttle_fasttravel", M.name) + break + + + if(href_list["preview"]) + if(S) + . = TRUE + unload_preview() + load_template(S) + if(preview_shuttle) + preview_template = S + user.forceMove(get_turf(preview_shuttle)) + + if(href_list["load"]) + if(existing_shuttle == shuttle_master.backup_shuttle) + // TODO make the load button disabled + WARNING("The shuttle that the selected shuttle will replace \ + is the backup shuttle. Backup shuttle is required to be \ + intact for round sanity.") + else if(S) + . = TRUE + // If successful, returns the mobile docking port + var/obj/docking_port/mobile/mdp = action_load(S) + if(mdp) + user.forceMove(get_turf(mdp)) + message_admins("[key_name_admin(usr)] loaded [mdp] \ + with the shuttle manipulator.") + log_admin("[key_name(usr)] loaded [mdp] with the \ + shuttle manipulator.") + feedback_add_details("shuttle_manipulator", mdp.name) + + +/obj/machinery/shuttle_manipulator/proc/action_load(datum/map_template/shuttle/loading_template) + // Check for an existing preview + if(preview_shuttle && (loading_template != preview_template)) + preview_shuttle.jumpToNullSpace() + preview_shuttle = null + preview_template = null + + if(!preview_shuttle) + load_template(loading_template) + preview_template = loading_template + + // get the existing shuttle information, if any + var/timer = 0 + var/mode = SHUTTLE_IDLE + var/obj/docking_port/stationary/D + + if(existing_shuttle) + timer = existing_shuttle.timer + mode = existing_shuttle.mode + D = existing_shuttle.get_docked() + else + D = preview_shuttle.findRoundstartDock() + + if(!D) + var/m = "No dock found for preview shuttle, aborting." + WARNING(m) + throw EXCEPTION(m) + + var/result = preview_shuttle.canDock(D) + // truthy value means that it cannot dock for some reason + // but we can ignore the someone else docked error because we'll + // be moving into their place shortly + if((result != SHUTTLE_CAN_DOCK) && (result != SHUTTLE_SOMEONE_ELSE_DOCKED)) + + var/m = "Unsuccessful dock of [preview_shuttle] ([result])." + message_admins("[m]") + WARNING(m) + return + + existing_shuttle.jumpToNullSpace() + + preview_shuttle.dock(D) + . = preview_shuttle + + // Shuttle state involves a mode and a timer based on world.time, so + // plugging the existing shuttles old values in works fine. + preview_shuttle.timer = timer + preview_shuttle.mode = mode + + preview_shuttle.register() + + // TODO indicate to the user that success happened, rather than just + // blanking the modification tab + existing_shuttle = null + preview_shuttle = null + preview_template = null + selected = null + + return preview_shuttle + +/obj/machinery/shuttle_manipulator/proc/load_template(datum/map_template/shuttle/S) + // load shuttle template, centred at shuttle import landmark, + var/turf/landmark_turf = get_turf(locate("landmark*Shuttle Import")) + S.load(landmark_turf, centered = TRUE) + + var/affected = S.get_affected_turfs(landmark_turf, centered=TRUE) + + var/found = 0 + // Search the turfs for docking ports + // - We need to find the mobile docking port because that is the heart of + // the shuttle. + // - We need to check that no additional ports have slipped in from the + // template, because that causes unintended behaviour. + for(var/T in affected) + for(var/obj/docking_port/P in T) + if(istype(P, /obj/docking_port/mobile)) + var/obj/docking_port/mobile/M = P + found++ + if(found > 1) + qdel(P, force=TRUE) + world.log << "Map warning: Shuttle Template [S.mappath] \ + has multiple mobile docking ports." + else if(!M.timid) + // The shuttle template we loaded isn't "timid" which means + // it's already registered with the shuttles subsystem. + // This is a bad thing. + var/m = "Template [S] is non-timid! Unloading." + WARNING(m) + M.jumpToNullSpace() + return + else + preview_shuttle = P + if(istype(P, /obj/docking_port/stationary)) + world.log << "Map warning: Shuttle Template [S.mappath] has a \ + stationary docking port." + if(!found) + var/msg = "load_template(): Shuttle Template [S.mappath] has no \ + mobile docking port. Aborting import." + for(var/T in affected)//wot do? + var/turf/T0 = T + T0.contents = null + + message_admins(msg) + WARNING(msg) + +/obj/machinery/shuttle_manipulator/proc/unload_preview() + if(preview_shuttle) + preview_shuttle.jumpToNullSpace() + preview_shuttle = null diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 474cbd91915..23d2fe52787 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -631,11 +631,11 @@ data["can_launch"] = !shuttle_master.supply.canMove() return data -/obj/machinery/computer/supplycomp/proc/is_authorized(user) +/obj/machinery/computer/supplycomp/proc/is_authorized(mob/user) if(allowed(user)) return 1 - if(isobserver(user) && check_rights(R_ADMIN, 0)) + if(user.can_admin_interact()) return 1 return 0 diff --git a/code/modules/spacepods/parts.dm b/code/modules/spacepods/parts.dm index 0747f1c5a14..d1aefb535e6 100644 --- a/code/modules/spacepods/parts.dm +++ b/code/modules/spacepods/parts.dm @@ -30,7 +30,7 @@ var/turf/T var/obj/item/pod_parts/pod_frame/linked var/obj/item/pod_parts/pod_frame/pointer - var/connectedparts = list() + var/list/connectedparts = list() neededparts -= src //log_admin("Starting with [src]") linked = src @@ -44,7 +44,8 @@ connectedparts += pointer linked = pointer pointer = null - //log_admin("Parts left: [neededparts.len]") //len not working + if(connectedparts.len < 4) + return 0 for(var/i = 1; i <=4; i++) var/obj/item/pod_parts/pod_frame/F = connectedparts[i] if(F.type in neededparts) //if one of the items can be founded in neededparts @@ -122,4 +123,4 @@ name = "civilian pod armor" icon = 'icons/goonstation/pods/pod_parts.dmi' icon_state = "pod_armor_civ" - desc = "Spacepod armor. This is the civilian version. It looks rather flimsy." \ No newline at end of file + desc = "Spacepod armor. This is the civilian version. It looks rather flimsy." diff --git a/code/modules/store/items.dm b/code/modules/store/items.dm index c67ed43fd92..4fc51d7fb8d 100644 --- a/code/modules/store/items.dm +++ b/code/modules/store/items.dm @@ -57,6 +57,12 @@ typepath = /obj/item/weapon/storage/box/dice cost = 200 +/datum/storeitem/nanomob_booster + name = "Nano-Mob Hunter Trading Card Booster Pack" + desc = "Contains 6 random Nano-Mob Hunter Trading Cards. May contain a holographic card!" + typepath = /obj/item/weapon/storage/box/nanomob_booster_pack + cost = 250 + /datum/storeitem/crayons name = "Crayons" desc = "Let security know how they're doing by scrawling lovenotes all over their hallways." diff --git a/html/changelog.html b/html/changelog.html index df4b0981066..3e54441aa65 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,18 +55,77 @@ -->
+
31 December 2016
+Crazylemon64 updated:
+-
+
- The home gateway now will send ghosts to the other end by default, now +
30 December 2016
+Crazylemon updated:
+-
+
- The shuttle manipulator can now only be used by admins +
FalseIncarnate updated:
+-
+
- Adds Nano-Mob Hunter GO! PDA game cartridges and related stuff. Grab a cartridge from the cartridge vendor or loadout and join in on the hunt! +
- Adds Nano-Mob Hunter GO! Battle Terminals to the Holodeck and a Nano-Mob Hunter GO! Restoration Terminal to medbay's lobby. +
Fox McCloud updated:
+-
+
- Fixes cyborg cryo oddities +
KasparoVy updated:
+-
+
- Taking off noir glasses while noir mode is on will now give you your colour vision back. +
29 December 2016
+Fethas updated:
+-
+
- Alternate shuttle/ferry template system from TG +
- Shuttle Manipulator +
- Better shuttle kills +
Markolie updated:
+-
+
- The camera console has been refactored so there's no longer a delay when switching cameras. +
- The camera console should no longer lag for several seconds. +
25 December 2016
+FalseIncarnate updated:
+-
+
- Santa's back and with-holding all your presents! Head through the gateway and show the Fat Man the strength of your holiday spirit (and advanced weaponry, you'll be needing that)! +
KasparoVy updated:
+-
+
- Cameras will no longer be able to take photos of stuff outside your line of sight. +
- Cameras will now render disguises as you see them. +
23 December 2016
Crazylemon64 updated:
- Welding overlays now update instantly
- Being inside various structures will now obscure your vision
Fox McCloud updated:
+-
+
- Fixes X-Ray not doing anything +
- Fixes nightvision not granting what its name implies +
- Fixes species/human darksight doing absolutely nothing +
KasparoVy updated:
- Characters will now be correctly assigned their species' genetic quirks at spawn.
- Cloning will now correctly assign a characters species' genetic quirks.
- Changing a character's species (via C.M.A. or whatever might call the set_species proc) will now correctly assign their species' genetic quirks.
Markolie updated:
+-
+
- Ruins no longer trigger power alarms. +
20 December 2016
TullyBurnalot updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index ad60276d04f..eaafa41fb23 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3192,9 +3192,49 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Crazylemon64: - tweak: Welding overlays now update instantly - tweak: Being inside various structures will now obscure your vision + Fox McCloud: + - bugfix: Fixes X-Ray not doing anything + - bugfix: Fixes nightvision not granting what its name implies + - bugfix: Fixes species/human darksight doing absolutely nothing KasparoVy: - bugfix: Characters will now be correctly assigned their species' genetic quirks at spawn. - bugfix: Cloning will now correctly assign a characters species' genetic quirks. - bugfix: Changing a character's species (via C.M.A. or whatever might call the set_species proc) will now correctly assign their species' genetic quirks. + Markolie: + - bugfix: Ruins no longer trigger power alarms. +2016-12-25: + FalseIncarnate: + - rscadd: Santa's back and with-holding all your presents! Head through the gateway + and show the Fat Man the strength of your holiday spirit (and advanced weaponry, + you'll be needing that)! + KasparoVy: + - bugfix: Cameras will no longer be able to take photos of stuff outside your line + of sight. + - tweak: Cameras will now render disguises as you see them. +2016-12-29: + Fethas: + - rscadd: Alternate shuttle/ferry template system from TG + - rscadd: Shuttle Manipulator + - rscadd: Better shuttle kills + Markolie: + - tweak: The camera console has been refactored so there's no longer a delay when + switching cameras. + - bugfix: The camera console should no longer lag for several seconds. +2016-12-30: + Crazylemon: + - bugfix: The shuttle manipulator can now only be used by admins + FalseIncarnate: + - rscadd: Adds Nano-Mob Hunter GO! PDA game cartridges and related stuff. Grab a + cartridge from the cartridge vendor or loadout and join in on the hunt! + - rscadd: Adds Nano-Mob Hunter GO! Battle Terminals to the Holodeck and a Nano-Mob + Hunter GO! Restoration Terminal to medbay's lobby. + Fox McCloud: + - bugfix: Fixes cyborg cryo oddities + KasparoVy: + - bugfix: Taking off noir glasses while noir mode is on will now give you your colour + vision back. +2016-12-31: + Crazylemon64: + - bugfix: The home gateway now will send ghosts to the other end by default, now diff --git a/icons/effects/mob_hunt.dmi b/icons/effects/mob_hunt.dmi new file mode 100644 index 00000000000..1eea83a9afa Binary files /dev/null and b/icons/effects/mob_hunt.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 00588161a65..4799f8736d2 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index 09380373db8..9ad68e22072 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/icons/obj/doors/Doorcult.dmi b/icons/obj/doors/Doorcult.dmi new file mode 100644 index 00000000000..f9f4aa92466 Binary files /dev/null and b/icons/obj/doors/Doorcult.dmi differ diff --git a/icons/obj/machines/shuttle_manipulator.dmi b/icons/obj/machines/shuttle_manipulator.dmi new file mode 100644 index 00000000000..ad91b1677b1 Binary files /dev/null and b/icons/obj/machines/shuttle_manipulator.dmi differ diff --git a/nano/templates/comm_console.tmpl b/nano/templates/comm_console.tmpl index 6d566aa85fb..c4e1799afcf 100644 --- a/nano/templates/comm_console.tmpl +++ b/nano/templates/comm_console.tmpl @@ -68,6 +68,9 @@ Used In File(s): /code/game/machinery/computers/communications.dm
{{:helper.link('Message List','comment',{'operation':'messagelist'})}}
+
+ {{:helper.link('Restart Nano-Mob Hunter GO! Server','power-off',{'operation':'RestartNanoMob'})}}
+
{{if data.dock_request}}
{{:helper.link('Accept Docking Request','signal',{'operation':'AcceptDocking'})}}
diff --git a/nano/templates/pda_mob_hunt.tmpl b/nano/templates/pda_mob_hunt.tmpl
new file mode 100644
index 00000000000..dde4ab82a5c
--- /dev/null
+++ b/nano/templates/pda_mob_hunt.tmpl
@@ -0,0 +1,91 @@
+
+
+ Wild mobs captured: {{:data.wild_captures}} +{{else}} +
+ Wild mobs captured: {{:data.wild_captures}} +
+
+
+{{if !data.selectedMenuKey || data.selectedMenuKey == 'stat'}}
+ {{for data.shuttles}}
+
+ {{for data.templates[data.existing_shuttle.id].templates}}
+
+
+
+
+
+
+| + Connection Status: + | + {{if data.connected}} ++ Connected + | ++ {{:helper.link('Disconnect', 'sign-out', {'choice': 'Disconnect'})}} + | + {{else}} ++ No Connection + | ++ {{:helper.link('Connect', 'sign-in', {'choice': 'Reconnect'})}} + | + {{/if}} +
+
My Collection:
+{{if data.no_collection}}
+
+
+
+ Your collection is empty! Go capture some Nano-Mobs!
+
+ + Wild mobs captured: {{:data.wild_captures}} +{{else}} +
+
+
+
+
+ {{if data.entry}}
+ {{if data.entry.nickname}}
+ Name: {{:data.entry.nickname}}
+ {{/if}} + Species: {{:data.entry.real_name}}
+ Level: {{:data.entry.level}}
+ Primary Type: {{:data.entry.type1}}
+ {{if data.entry.type2}} + Secondary Type: {{:data.entry.type2}}
+ {{/if}} + {{if data.entry.sprite}} +
+ {{else}}
+ Mob Image Missing!
+ {{/if}}
+ {{else}}
+
+ Mob Data Missing!
+ + {{/if}} +
+ + {{/if}} + Species: {{:data.entry.real_name}}
+ Level: {{:data.entry.level}}
+ Primary Type: {{:data.entry.type1}}
+ {{if data.entry.type2}} + Secondary Type: {{:data.entry.type2}}
+ {{/if}} + {{if data.entry.sprite}} +
+ + {{/if}} +
+ Wild mobs captured: {{:data.wild_captures}} +
+
+
+ {{if data.entry.is_hacked}}
+
+ {{:helper.link('Set Trap', 'bolt', {'choice': 'Set_Trap'})}} + {{/if}} +
+{{/if}}
\ No newline at end of file
diff --git a/nano/templates/shuttle_manipulator.tmpl b/nano/templates/shuttle_manipulator.tmpl
new file mode 100644
index 00000000000..023e7e63e3d
--- /dev/null
+++ b/nano/templates/shuttle_manipulator.tmpl
@@ -0,0 +1,121 @@
+
+
+| + {{:helper.link('Previous Mob', 'arrow-left', {'choice': 'Prev'})}} + | ++ {{:helper.link('Transfer Mob', 'exchange', {'choice': 'Transfer'})}} + | ++ {{:helper.link('Rename Mob', 'pencil', {'choice': 'Rename'})}} + | ++ {{:helper.link('Release Mob', 'tree', {'choice': 'Release'})}} + | ++ {{:helper.link('Next Mob', 'arrow-right', {'choice': 'Next'})}} + | +
+ {{:helper.link('Set Trap', 'bolt', {'choice': 'Set_Trap'})}} + {{/if}} +
Operations
+
+ {{:helper.link('Status', 'link', {'selectMenuKey' : 'stat'}, data.selectedMenuKey == 'stat' ? 'selected' : null)}}
+ {{:helper.link('Templates', 'link', {'selectMenuKey' : 'stemp'}, data.selectedMenuKey == 'stemp' ? 'selected' : null)}}
+ {{:helper.link('Modification', 'link', {'selectMenuKey' : 'mod'}, data.selectedMenuKey == 'mod' ? 'selected' : null)}}
+
+
+
+
+ {{/for}}
+
+{{else data.selectedMenuKey == 'stemp'}}
+
+ Name: {{:value.name}}
+
+
+ ID: {{:value.id}}
+
+
+ Shuttle Timer: {{:value.timeleft}}
+
+
+ Shuttle Mode: {{:value.mode}}
+
+
+ Shuttle Status: {{:value.status}}
+
+
+ {{:helper.link('Jump to', 'space-shuttle', {'jump_to' : 1, 'type' : 'mobile', 'id' : value.id}, null)}}
+ {{:helper.link('Fast Travel', 'rocket', {'fast_travel' : 1, 'id' : value.id}, null)}}
+
+
+ {{for data.templates_tabs}}
+ {{:helper.link(value, 'space-shuttle', {'select_template_category' : value}, (data.existing_shuttle.id == value) ? 'selected' : null)}}
+ {{/for}}
+
+ {{if data.existing_shuttle}}
+
+
+ {{/for}}
+ {{/if}}
+
+
+{{else data.selectedMenuKey == 'mod'}}
+
+ Name: {{:value.name}}
+
+ {{if value.description}}
+
+ Description: {{:value.description}}
+
+ {{/if}}
+ {{if value.admin_notes}}
+
+ Admin Notes: {{:value.admin_notes}}
+
+ {{/if}}
+
+
+ {{:helper.link('select template', 'space-shuttle', {'select_template' : 1, 'shuttle_id' : value.shuttle_id}, (data.selected && data.selected.shuttle_id == value.shuttle_id) ? 'selected' : null)}}
+
+
+ {{if data.existing_shuttle}}
+
+{{/if}}
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index 94cf8409c7d..e18f8500930 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -176,6 +176,7 @@
#include "code\controllers\Processes\lighting.dm"
#include "code\controllers\Processes\machinery.dm"
#include "code\controllers\Processes\mob.dm"
+#include "code\controllers\Processes\nano_mob_hunter.dm"
#include "code\controllers\Processes\nanoui.dm"
#include "code\controllers\Processes\npcai.dm"
#include "code\controllers\Processes\npcpool.dm"
@@ -207,6 +208,7 @@
#include "code\datums\progressbar.dm"
#include "code\datums\recipe.dm"
#include "code\datums\ruins.dm"
+#include "code\datums\shuttles.dm"
#include "code\datums\spell.dm"
#include "code\datums\statclick.dm"
#include "code\datums\supplypacks.dm"
@@ -1056,6 +1058,11 @@
#include "code\modules\arcade\claw_game.dm"
#include "code\modules\arcade\prize_counter.dm"
#include "code\modules\arcade\prize_datums.dm"
+#include "code\modules\arcade\mob_hunt\battle_computer.dm"
+#include "code\modules\arcade\mob_hunt\mob_avatar.dm"
+#include "code\modules\arcade\mob_hunt\mob_cards.dm"
+#include "code\modules\arcade\mob_hunt\mob_datums.dm"
+#include "code\modules\arcade\mob_hunt\mob_type_datums.dm"
#include "code\modules\assembly\assembly.dm"
#include "code\modules\assembly\bomb.dm"
#include "code\modules\assembly\health.dm"
@@ -1736,6 +1743,7 @@
#include "code\modules\pda\core_apps.dm"
#include "code\modules\pda\messenger.dm"
#include "code\modules\pda\messenger_plugins.dm"
+#include "code\modules\pda\mob_hunt_game_app.dm"
#include "code\modules\pda\PDA.dm"
#include "code\modules\pda\pdas.dm"
#include "code\modules\pda\radio.dm"
@@ -1989,7 +1997,9 @@
#include "code\modules\security_levels\security levels.dm"
#include "code\modules\shuttle\assault_pod.dm"
#include "code\modules\shuttle\emergency.dm"
+#include "code\modules\shuttle\on_move.dm"
#include "code\modules\shuttle\shuttle.dm"
+#include "code\modules\shuttle\shuttle_manipulator.dm"
#include "code\modules\shuttle\supply.dm"
#include "code\modules\shuttle\syndicate.dm"
#include "code\modules\space_management\heap_space_level.dm"
+
+ {{else}}
+
+ Existing Shuttle: {{:data.existing_shuttle.name}}
+
+
+ Status: {{:data.existing_shuttle.status}}
+
+ {{if data.existing_shuttle.timer}}
+
+ ({{:data.existing_shuttle.timeleft}})
+
+ {{/if}}
+
+ {{:helper.link('Jump to', 'space-shuttle', {'jump_to' : 1, 'type' : 'mobile', 'id' : data.existing_shuttle.id}, null)}}
+
+ No shuttle selected
+ {{/if}} + + + {{if data.selected}} +
+
+ {{else}}
+
+ Name: {{:data.selected.name}}
+
+ {{if data.selected.description}}
+
+ Description: {{:data.selected.description}}
+
+ {{/if}}
+ {{if data.selected.admin_notes}}
+
+ Admin Notes: {{:data.selected.admin_notes}}
+
+ {{/if}}
+
+
+ {{:helper.link('Preview', 'exclamation-circle', {'preview' : 1, 'shuttle_id' : data.selected.shuttle_id}, null)}}
+ {{:helper.link('Load', 'exclamation-circle', {'load' : 1, 'shuttle_id' : data.selected.shuttle_id}, null)}}
+
+